From f9fea4008f517a21d9d029d3ca93cdc0c79a8b0d Mon Sep 17 00:00:00 2001
From: andreea <nicoleta.pasare@gmail.com>
Date: Tue, 12 Sep 2023 09:59:59 +0300
Subject: [PATCH] updated xml files

---
 .../xmi_conceptual_model/eCatalogue_CM.xml    |  6133 ++-
 .../xmi_conceptual_model/eContract_CM.xml     |  1232 +-
 .../xmi_conceptual_model/eFulfilment_CM.xml   |  3124 +-
 .../xmi_conceptual_model/eNotice_CM.xml       |   841 +-
 .../xmi_conceptual_model/eOrdering_CM.xml     |  3295 +-
 .../ePO/xmi_conceptual_model/ePO_CM.xml       | 37307 ++++++++--------
 6 files changed, 26806 insertions(+), 25126 deletions(-)

diff --git a/implementation/eCatalogue/xmi_conceptual_model/eCatalogue_CM.xml b/implementation/eCatalogue/xmi_conceptual_model/eCatalogue_CM.xml
index 6601e515..027c8f87 100644
--- a/implementation/eCatalogue/xmi_conceptual_model/eCatalogue_CM.xml
+++ b/implementation/eCatalogue/xmi_conceptual_model/eCatalogue_CM.xml
@@ -4,30 +4,804 @@
 	<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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. ">
-						<annotatedElement xmi:idref="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D"/>
-					</ownedComment>
-					<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"/>
+				<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: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_33A89700_846B_47cb_93D9_9D4729194EA6" name="at-voc-new:tax-scheme"/>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" name="at-voc-new:tax-category"/>
+				<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_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_LI000001__57A6_4142_86D1_A887FC375039" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__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_AD18A153_57A6_4142_86D1_A887FC375039">
+					<memberEnd xmi:idref="EAID_dst18A153_57A6_4142_86D1_A887FC375039"/>
+					<memberEnd xmi:idref="EAID_src18A153_57A6_4142_86D1_A887FC375039"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18A153_57A6_4142_86D1_A887FC375039" association="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
+						<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+					<memberEnd xmi:idref="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148"/>
+					<memberEnd xmi:idref="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+					<memberEnd xmi:idref="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38"/>
+					<memberEnd xmi:idref="EAID_src4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" association="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+						<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1163CB_9C26_4b4f_BCD6_23ABF38C12BE" association="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
+					<memberEnd xmi:idref="EAID_dst9C4956_D3A6_47cd_966E_C37D023DC755"/>
+					<memberEnd xmi:idref="EAID_src9C4956_D3A6_47cd_966E_C37D023DC755"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C4956_D3A6_47cd_966E_C37D023DC755" association="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
+						<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" name="epo-cat:ItemComplementaryRelation">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_75741E53_D423_4195_A619_A6477F3A2F70" name="epo-cat:ItemAccessoryRelation">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</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_LI000003_8580_4844_AC6A_B3652BF66F0E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_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_LI000005__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
+					<memberEnd xmi:idref="EAID_dstB0C90F_39E1_4d42_9568_8E5CF7B00FDD"/>
+					<memberEnd xmi:idref="EAID_srcB0C90F_39E1_4d42_9568_8E5CF7B00FDD"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB0C90F_39E1_4d42_9568_8E5CF7B00FDD" association="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
+						<type xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
+					<memberEnd xmi:idref="EAID_dstF54CAF_0D08_45a7_BB5B_816DF773903A"/>
+					<memberEnd xmi:idref="EAID_srcF54CAF_0D08_45a7_BB5B_816DF773903A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF54CAF_0D08_45a7_BB5B_816DF773903A" association="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" name="epo-cat:ItemReplacement">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" name="at-voc-new:item-classification"/>
+				<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_LI000007_9519_4482_BD71_DFF632D155C2" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_9519_4482_BD71_DFF632D155C2" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
+					<memberEnd xmi:idref="EAID_dst34A9FD_D673_4331_8F43_3A98DA6CD0B7"/>
+					<memberEnd xmi:idref="EAID_src34A9FD_D673_4331_8F43_3A98DA6CD0B7"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src34A9FD_D673_4331_8F43_3A98DA6CD0B7" association="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<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"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
+					<memberEnd xmi:idref="EAID_dstF8E397_60D1_4c6e_8AC0_E18C87C2622B"/>
+					<memberEnd xmi:idref="EAID_srcF8E397_60D1_4c6e_8AC0_E18C87C2622B"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF8E397_60D1_4c6e_8AC0_E18C87C2622B" association="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</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_LI000011_AD07_486d_8D59_3528CDA63AAC" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012_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_LI000013_2D4C_4dd8_8443_CCD64C72E323" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_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_LI000015_BEA3_4ea4_9F18_96D02FFDCB96" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_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_LI000017__2E18_40c1_BB08_B80EA400868A" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__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_LI000019__7FF7_41ad_9ACB_A1015C643C97" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__7FF7_41ad_9ACB_A1015C643C97" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
+					<memberEnd xmi:idref="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A"/>
+					<memberEnd xmi:idref="EAID_srcA0DAC3_2E18_40c1_BB08_B80EA400868A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA0DAC3_2E18_40c1_BB08_B80EA400868A" association="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
+						<type xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E"/>
+					</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:Enumeration" xmi:id="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" name="at-voc-new:activity-code"/>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" name="at-voc-new:dangerous-goods-list"/>
+				<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_LI000021__9E04_44d6_B0B4_339ED74111CC" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__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>
+				<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_F58320C5_899E_4f5f_971B_BF5DE149A892">
+					<memberEnd xmi:idref="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892"/>
+					<memberEnd xmi:idref="EAID_src8320C5_899E_4f5f_971B_BF5DE149A892"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8320C5_899E_4f5f_971B_BF5DE149A892" association="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" name="at-voc-new:delivery-item-type"/>
+				<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_LI000023_6233_423a_9884_110D0A949ED9" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_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_LI000025_1B85_4bd9_9A0A_EED7EF527F0F" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026_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_LI000027_1F4C_4f2d_9BC0_630E39EA86C6" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028_1F4C_4f2d_9BC0_630E39EA86C6" 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_LI000029__5113_4e40_A80A_3CDDD84D3629" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__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_LI000031__36FA_46d5_AA00_34CA1CC60CA2" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__36FA_46d5_AA00_34CA1CC60CA2" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
+					<memberEnd xmi:idref="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629"/>
+					<memberEnd xmi:idref="EAID_src92BD51_5113_4e40_A80A_3CDDD84D3629"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92BD51_5113_4e40_A80A_3CDDD84D3629" association="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
+						<type xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4"/>
+					</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:Class" xmi:id="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" name="epo-cat:ItemComposition">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" name="epo-cat:ProductSpecification">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
+					<memberEnd xmi:idref="EAID_dst5C76C8_B834_46d5_A5CA_93F12F0E5824"/>
+					<memberEnd xmi:idref="EAID_src5C76C8_B834_46d5_A5CA_93F12F0E5824"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5C76C8_B834_46d5_A5CA_93F12F0E5824" association="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<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_LI000033__0B95_4c94_B742_4DC2F5EAF55E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__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_LI000035__2DEE_491f_A5F1_B592E89F9030" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__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_LI000037__7502_49f2_984C_17FF6E47F8F9" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__7502_49f2_984C_17FF6E47F8F9" 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_LI000039__A3BC_4cfc_BFCF_A26F9C0B1D38" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__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_LI000041__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__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_LI000043__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__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_LI000045__695C_4b42_8481_D40EEC904171" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__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_LI000047__1814_4dd4_BD97_28BD0C9F2F49" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__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_LI000049__9DDF_4d5b_980E_9D85403496D0" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__9DDF_4d5b_980E_9D85403496D0" value="1"/>
+					</ownedAttribute>
+				</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB1CFC6_0B95_4c94_B742_4DC2F5EAF55E" association="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+						<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					</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_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_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_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_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:Dependency" xmi:id="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" supplier="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" client="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+					<memberEnd xmi:idref="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0"/>
+					<memberEnd xmi:idref="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0" association="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+						<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D" association="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
+						<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+					<memberEnd xmi:idref="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA"/>
+					<memberEnd xmi:idref="EAID_src28A6D1_3F44_48a1_A013_1A7BA2859AFA"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src28A6D1_3F44_48a1_A013_1A7BA2859AFA" association="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+						<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
+					<memberEnd xmi:idref="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB"/>
+					<memberEnd xmi:idref="EAID_src6E2C47_4590_4730_B50C_8F40D73778CB"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6E2C47_4590_4730_B50C_8F40D73778CB" association="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
+						<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+					</ownedEnd>
+				</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_LI000051_2CFF_4c26_9532_EB27449F27A5" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_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_LI000053_3C35_4d9e_90DA_7AFEA316F25B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054_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_LI000055_8B76_44e1_BE3C_78945DDC9AB5" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056_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_LI000057_2FEC_42db_A241_77B8583908EF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058_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_LI000059_60EE_420d_97ED_66D2A42238A1" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060_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_LI000061_7828_42fb_9986_2F847B78C3DA" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062_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_LI000063__0D37_48b2_B8F5_8C2924DBDB24" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__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_LI000065__0D08_45a7_BB5B_816DF773903A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__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_LI000067__60D1_4c6e_8AC0_E18C87C2622B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__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_LI000069__BFB6_40bb_84F1_8A3969FE662E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__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_LI000071__4D59_4119_A715_C0AF0EF80B65" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__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_LI000073__3BA3_4795_8084_FD257C99FB89" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__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_LI000075__B834_46d5_A5CA_93F12F0E5824" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__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_LI000077__EF8D_49e2_821D_FF39CCA1773F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__EF8D_49e2_821D_FF39CCA1773F" 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_LI000079__4929_4670_9014_608B3C5534ED" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__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_LI000081__45CB_45ba_9792_E3508C6FE92A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__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_LI000083__17CC_499e_A49B_8791C8D7CBEA" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__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_LI000085__531D_4495_9397_CE5771200854" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__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_LI000087__836E_494c_A0AF_73F7FB5C8991" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__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_LI000089__3236_4fcb_B51A_14A66F3D627C" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__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_LI000091__D673_4331_8F43_3A98DA6CD0B7" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__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_LI000093__1A41_4b43_873A_F9E88411186D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__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_LI000095__19B4_47d7_A201_D8391B5C67DF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__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_LI000097__899E_4f5f_971B_BF5DE149A892" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__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"/>
+					</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_LI000099__836E_494c_A0AF_73F7FB5C8991" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__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"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
+					<memberEnd xmi:idref="EAID_dst6B1F71_0D37_48b2_B8F5_8C2924DBDB24"/>
+					<memberEnd xmi:idref="EAID_src6B1F71_0D37_48b2_B8F5_8C2924DBDB24"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B1F71_0D37_48b2_B8F5_8C2924DBDB24" association="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</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_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_3570E246_3BA3_4795_8084_FD257C99FB89">
+					<memberEnd xmi:idref="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89"/>
+					<memberEnd xmi:idref="EAID_src70E246_3BA3_4795_8084_FD257C99FB89"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src70E246_3BA3_4795_8084_FD257C99FB89" association="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
+					<memberEnd xmi:idref="EAID_dst8C85CC_EF8D_49e2_821D_FF39CCA1773F"/>
+					<memberEnd xmi:idref="EAID_src8C85CC_EF8D_49e2_821D_FF39CCA1773F"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C85CC_EF8D_49e2_821D_FF39CCA1773F" association="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
+						<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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4DB5D8_4929_4670_9014_608B3C5534ED" association="EAID_574DB5D8_4929_4670_9014_608B3C5534ED">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+					<memberEnd xmi:idref="EAID_dst49101F_45CB_45ba_9792_E3508C6FE92A"/>
+					<memberEnd xmi:idref="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A" association="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" supplier="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+				<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:Dependency" xmi:id="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" supplier="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854">
+					<memberEnd xmi:idref="EAID_dst2B738F_531D_4495_9397_CE5771200854"/>
+					<memberEnd xmi:idref="EAID_src2B738F_531D_4495_9397_CE5771200854"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B738F_531D_4495_9397_CE5771200854" association="EAID_AF2B738F_531D_4495_9397_CE5771200854">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
+					<memberEnd xmi:idref="EAID_dst8B62CF_836E_494c_A0AF_73F7FB5C8991"/>
+					<memberEnd xmi:idref="EAID_src8B62CF_836E_494c_A0AF_73F7FB5C8991"/>
+				</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_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:Dependency" xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" supplier="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+					<memberEnd xmi:idref="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9"/>
+					<memberEnd xmi:idref="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9" association="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</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_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" name="epo-cat:ItemRequirement">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</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_LI000101_4A82_4912_8FAB_B8F008971603" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_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_LI000103_DB6B_4a7d_9D89_28022FD2ADF9" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_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_LI000105_970B_44c9_A7ED_42A9A735C2A5" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_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_LI000107_B759_4395_BB70_DDF2E8D940A7" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108_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_LI000109_067C_4ccb_A27A_2C53C993F704" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110_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_LI000111_8555_4378_9A2D_09158D45F0AB" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_8555_4378_9A2D_09158D45F0AB" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</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_LI000113__3F44_48a1_A013_1A7BA2859AFA" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__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_LI000115__4590_4730_B50C_8F40D73778CB" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__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_LI000117__D9FB_4937_B866_FABECBC1DB55" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__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_LI000119__D3A6_47cd_966E_C37D023DC755" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__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_LI000121__614F_4b1c_AE59_F45CD626BB7A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__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_LI000123__48A3_41f5_A736_268C91FF8AF2" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__48A3_41f5_A736_268C91FF8AF2" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_727947BB_24E3_4f23_AB2D_F11A323AD4DB" supplier="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" client="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8492830E_8275_4640_A08F_A44A8AA0EE1E" supplier="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" client="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+				<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_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:Dependency" xmi:id="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93" supplier="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" client="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<memberEnd xmi:idref="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
+					<memberEnd xmi:idref="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07" association="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+						<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
+					<memberEnd xmi:idref="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782"/>
+					<memberEnd xmi:idref="EAID_srcBEA51D_27BB_47b3_9536_602D5F0E8782"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBEA51D_27BB_47b3_9536_602D5F0E8782" association="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" name="at-voc-new:transaction-conditions"/>
+				<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_LI000125_FF3B_4e45_8E68_393EB2A79185" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126_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_LI000127__29BF_4efe_807B_B6FA3BB29BF5" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__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_LI000129__E481_4fb3_9090_B37DC376C605" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__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_LI000131__3EB6_44da_84E5_92EF1E2753B3" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__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_LI000133__27BB_47b3_9536_602D5F0E8782" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__27BB_47b3_9536_602D5F0E8782" value="*"/>
+					</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_LI000135__08DB_4bb5_A279_498213B45F8E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__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_LI000137__F2D3_48ca_8D27_E3F34E3AF36B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__F2D3_48ca_8D27_E3F34E3AF36B" value="*"/>
+					</ownedAttribute>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" name="classes">
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+					<memberEnd xmi:idref="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5"/>
+					<memberEnd xmi:idref="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5" association="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+					<memberEnd xmi:idref="EAID_dst89809C_E481_4fb3_9090_B37DC376C605"/>
+					<memberEnd xmi:idref="EAID_src89809C_E481_4fb3_9090_B37DC376C605"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89809C_E481_4fb3_9090_B37DC376C605" association="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+					<memberEnd xmi:idref="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
+					<memberEnd xmi:idref="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3" association="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
+					<memberEnd xmi:idref="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E"/>
+					<memberEnd xmi:idref="EAID_src94D054_08DB_4bb5_A279_498213B45F8E"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src94D054_08DB_4bb5_A279_498213B45F8E" association="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0C71CA_F2D3_48ca_8D27_E3F34E3AF36B" association="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" supplier="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" client="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
+					<memberEnd xmi:idref="EAID_dst3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
+					<memberEnd xmi:idref="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC" association="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" name="at-voc-new:orderable-unit"/>
+				<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="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000139__CD52_4521_96D4_FF2138630244" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__CD52_4521_96D4_FF2138630244" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB038715_CD52_4521_96D4_FF2138630244">
@@ -39,19 +813,19 @@
 					</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"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000141_DC4C_492c_969F_2EF25B5E086F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142_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"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000143__89C8_4ed0_9551_9C0C13B80044" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__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"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000145__6882_44e8_BD03_7B202CFA4807" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__6882_44e8_BD03_7B202CFA4807" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D387FBF1_89C8_4ed0_9551_9C0C13B80044">
@@ -61,13 +835,6 @@
 							<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>
@@ -87,869 +854,6 @@
 							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
 						</ownedEnd>
 					</packagedElement>
-					<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"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
-						<memberEnd xmi:idref="EAID_dstF8E397_60D1_4c6e_8AC0_E18C87C2622B"/>
-						<memberEnd xmi:idref="EAID_srcF8E397_60D1_4c6e_8AC0_E18C87C2622B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF8E397_60D1_4c6e_8AC0_E18C87C2622B" association="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" name="epo-cat:CatalogueFragment">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8" general="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst809D8C_0B3B_4e2f_B8FF_9D9F521B5907" name="epo-cat:updatesCatalogue" association="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__0B3B_4e2f_B8FF_9D9F521B5907" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__0B3B_4e2f_B8FF_9D9F521B5907" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-						<memberEnd xmi:idref="EAID_dst809D8C_0B3B_4e2f_B8FF_9D9F521B5907"/>
-						<memberEnd xmi:idref="EAID_src809D8C_0B3B_4e2f_B8FF_9D9F521B5907"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src809D8C_0B3B_4e2f_B8FF_9D9F521B5907" association="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-							<type xmi:idref="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" supplier="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" client="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" name="epo-cat:CertificationLabel">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E5097931_AB6F_4533_9B27_84455D46F093" name="epo-cat:hasReferenceURI">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_AB6F_4533_9B27_84455D46F093" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B62DE754_3523_45c7_9426_333EF3B4B423" supplier="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" client="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB">
-						<memberEnd xmi:idref="EAID_dstBED690_3A74_4118_8357_6957359310FB"/>
-						<memberEnd xmi:idref="EAID_srcBED690_3A74_4118_8357_6957359310FB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBED690_3A74_4118_8357_6957359310FB" association="EAID_C3BED690_3A74_4118_8357_6957359310FB">
-							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" name="epo-cat:Certifier"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
-						<memberEnd xmi:idref="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71"/>
-						<memberEnd xmi:idref="EAID_src176015_1FBF_4d9c_9A77_C246A6F21E71"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src176015_1FBF_4d9c_9A77_C246A6F21E71" association="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
-							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-						</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_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_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_AD18A153_57A6_4142_86D1_A887FC375039">
-						<memberEnd xmi:idref="EAID_dst18A153_57A6_4142_86D1_A887FC375039"/>
-						<memberEnd xmi:idref="EAID_src18A153_57A6_4142_86D1_A887FC375039"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18A153_57A6_4142_86D1_A887FC375039" association="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
-							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-						<memberEnd xmi:idref="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148"/>
-						<memberEnd xmi:idref="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-						<memberEnd xmi:idref="EAID_dst4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38"/>
-						<memberEnd xmi:idref="EAID_src4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38" association="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1163CB_9C26_4b4f_BCD6_23ABF38C12BE" association="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
-						<memberEnd xmi:idref="EAID_dst9C4956_D3A6_47cd_966E_C37D023DC755"/>
-						<memberEnd xmi:idref="EAID_src9C4956_D3A6_47cd_966E_C37D023DC755"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C4956_D3A6_47cd_966E_C37D023DC755" association="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_75741E53_D423_4195_A619_A6477F3A2F70" name="epo-cat:ItemAccessoryRelation">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" name="epo-cat:Certificate">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_54DC11DF_DA18_4262_A463_6D90A10A85D1" name="epo-cat:hasCertificationNumber">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017_DA18_4262_A463_6D90A10A85D1" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_DA18_4262_A463_6D90A10A85D1" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_54479CB6_87F3_4910_BFF6_0EAAC1E6F403" name="epo:hasURL">
-							<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>
-						<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_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_LI000021__FE85_48db_829F_004DFE769A97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__FE85_48db_829F_004DFE769A97" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71" name="epo-cat: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_LI000023__1FBF_4d9c_9A77_C246A6F21E71" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__1FBF_4d9c_9A77_C246A6F21E71" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBED690_3A74_4118_8357_6957359310FB" name="epo-cat: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_LI000025__3A74_4118_8357_6957359310FB" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__3A74_4118_8357_6957359310FB" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-						<memberEnd xmi:idref="EAID_dst64913C_FE85_48db_829F_004DFE769A97"/>
-						<memberEnd xmi:idref="EAID_src64913C_FE85_48db_829F_004DFE769A97"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64913C_FE85_48db_829F_004DFE769A97" association="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
-						<memberEnd xmi:idref="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
-						<memberEnd xmi:idref="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1" association="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
-							<type xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
-						<memberEnd xmi:idref="EAID_dst49101F_45CB_45ba_9792_E3508C6FE92A"/>
-						<memberEnd xmi:idref="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A" association="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
-						<memberEnd xmi:idref="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
-						<memberEnd xmi:idref="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42" association="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" name="epo-cat:ItemComplementaryRelation">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" name="epo-cat:ItemComposition">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					</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_LI000027_6233_423a_9884_110D0A949ED9" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028_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_LI000029_1B85_4bd9_9A0A_EED7EF527F0F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030_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_LI000031_1F4C_4f2d_9BC0_630E39EA86C6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032_1F4C_4f2d_9BC0_630E39EA86C6" 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_LI000033__5113_4e40_A80A_3CDDD84D3629" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__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_LI000035__36FA_46d5_AA00_34CA1CC60CA2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__36FA_46d5_AA00_34CA1CC60CA2" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
-						<memberEnd xmi:idref="EAID_dst92BD51_5113_4e40_A80A_3CDDD84D3629"/>
-						<memberEnd xmi:idref="EAID_src92BD51_5113_4e40_A80A_3CDDD84D3629"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src92BD51_5113_4e40_A80A_3CDDD84D3629" association="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
-							<type xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4"/>
-						</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: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_LI000037_9519_4482_BD71_DFF632D155C2" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038_9519_4482_BD71_DFF632D155C2" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
-						<memberEnd xmi:idref="EAID_dst34A9FD_D673_4331_8F43_3A98DA6CD0B7"/>
-						<memberEnd xmi:idref="EAID_src34A9FD_D673_4331_8F43_3A98DA6CD0B7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src34A9FD_D673_4331_8F43_3A98DA6CD0B7" association="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</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_LI000039_8580_4844_AC6A_B3652BF66F0E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040_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_LI000041__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__39E1_4d42_9568_8E5CF7B00FDD" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
-						<memberEnd xmi:idref="EAID_dstB0C90F_39E1_4d42_9568_8E5CF7B00FDD"/>
-						<memberEnd xmi:idref="EAID_srcB0C90F_39E1_4d42_9568_8E5CF7B00FDD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB0C90F_39E1_4d42_9568_8E5CF7B00FDD" association="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
-							<type xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
-						<memberEnd xmi:idref="EAID_dstF54CAF_0D08_45a7_BB5B_816DF773903A"/>
-						<memberEnd xmi:idref="EAID_srcF54CAF_0D08_45a7_BB5B_816DF773903A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF54CAF_0D08_45a7_BB5B_816DF773903A" association="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" name="epo-cat:ItemReplacement">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" name="epo-cat:ItemRequirement">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" general="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					</packagedElement>
-					<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_LI000043__0B95_4c94_B742_4DC2F5EAF55E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__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_LI000045__2DEE_491f_A5F1_B592E89F9030" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__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_LI000047__7502_49f2_984C_17FF6E47F8F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__7502_49f2_984C_17FF6E47F8F9" 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_LI000049__A3BC_4cfc_BFCF_A26F9C0B1D38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__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_LI000051__815F_45f4_87EA_C0E83DC5C9AF" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__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_LI000053__ABC4_4408_B3EA_A725F5A385F7" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__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_LI000055__695C_4b42_8481_D40EEC904171" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__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_LI000057__1814_4dd4_BD97_28BD0C9F2F49" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__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_LI000059__9DDF_4d5b_980E_9D85403496D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__9DDF_4d5b_980E_9D85403496D0" value="1"/>
-						</ownedAttribute>
-					</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB1CFC6_0B95_4c94_B742_4DC2F5EAF55E" association="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</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_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_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_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_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:Dependency" xmi:id="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" supplier="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" client="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-						<memberEnd xmi:idref="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0"/>
-						<memberEnd xmi:idref="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0" association="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D" association="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-						<memberEnd xmi:idref="EAID_dst28A6D1_3F44_48a1_A013_1A7BA2859AFA"/>
-						<memberEnd xmi:idref="EAID_src28A6D1_3F44_48a1_A013_1A7BA2859AFA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src28A6D1_3F44_48a1_A013_1A7BA2859AFA" association="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
-						<memberEnd xmi:idref="EAID_dst6E2C47_4590_4730_B50C_8F40D73778CB"/>
-						<memberEnd xmi:idref="EAID_src6E2C47_4590_4730_B50C_8F40D73778CB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6E2C47_4590_4730_B50C_8F40D73778CB" association="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
-							<type xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" name="epo-cat:ProductSpecification">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" general="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
-						<memberEnd xmi:idref="EAID_dst5C76C8_B834_46d5_A5CA_93F12F0E5824"/>
-						<memberEnd xmi:idref="EAID_src5C76C8_B834_46d5_A5CA_93F12F0E5824"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5C76C8_B834_46d5_A5CA_93F12F0E5824" association="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<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_LI000061__9E04_44d6_B0B4_339ED74111CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__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>
-					<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_F58320C5_899E_4f5f_971B_BF5DE149A892">
-						<memberEnd xmi:idref="EAID_dst8320C5_899E_4f5f_971B_BF5DE149A892"/>
-						<memberEnd xmi:idref="EAID_src8320C5_899E_4f5f_971B_BF5DE149A892"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8320C5_899E_4f5f_971B_BF5DE149A892" association="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</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_LI000063_FF3B_4e45_8E68_393EB2A79185" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_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_LI000065__29BF_4efe_807B_B6FA3BB29BF5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__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_LI000067__E481_4fb3_9090_B37DC376C605" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__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_LI000069__3EB6_44da_84E5_92EF1E2753B3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__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_LI000071__27BB_47b3_9536_602D5F0E8782" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__27BB_47b3_9536_602D5F0E8782" value="*"/>
-						</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_LI000073__08DB_4bb5_A279_498213B45F8E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__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_LI000075__F2D3_48ca_8D27_E3F34E3AF36B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__F2D3_48ca_8D27_E3F34E3AF36B" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-						<memberEnd xmi:idref="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5"/>
-						<memberEnd xmi:idref="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5" association="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-						<memberEnd xmi:idref="EAID_dst89809C_E481_4fb3_9090_B37DC376C605"/>
-						<memberEnd xmi:idref="EAID_src89809C_E481_4fb3_9090_B37DC376C605"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89809C_E481_4fb3_9090_B37DC376C605" association="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-						<memberEnd xmi:idref="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
-						<memberEnd xmi:idref="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3" association="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
-						<memberEnd xmi:idref="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782"/>
-						<memberEnd xmi:idref="EAID_srcBEA51D_27BB_47b3_9536_602D5F0E8782"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBEA51D_27BB_47b3_9536_602D5F0E8782" association="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-						<memberEnd xmi:idref="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E"/>
-						<memberEnd xmi:idref="EAID_src94D054_08DB_4bb5_A279_498213B45F8E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src94D054_08DB_4bb5_A279_498213B45F8E" association="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0C71CA_F2D3_48ca_8D27_E3F34E3AF36B" association="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
-						<memberEnd xmi:idref="EAID_dst3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
-						<memberEnd xmi:idref="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC" association="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</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_LI000077_4A82_4912_8FAB_B8F008971603" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078_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_LI000079_DB6B_4a7d_9D89_28022FD2ADF9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080_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_LI000081_970B_44c9_A7ED_42A9A735C2A5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082_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_LI000083_B759_4395_BB70_DDF2E8D940A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_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_LI000085_067C_4ccb_A27A_2C53C993F704" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086_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_LI000087_8555_4378_9A2D_09158D45F0AB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088_8555_4378_9A2D_09158D45F0AB" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</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_LI000089__3F44_48a1_A013_1A7BA2859AFA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__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_LI000091__4590_4730_B50C_8F40D73778CB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__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_LI000093__D9FB_4937_B866_FABECBC1DB55" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__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_LI000095__D3A6_47cd_966E_C37D023DC755" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__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_LI000097__614F_4b1c_AE59_F45CD626BB7A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__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_LI000099__48A3_41f5_A736_268C91FF8AF2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__48A3_41f5_A736_268C91FF8AF2" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_727947BB_24E3_4f23_AB2D_F11A323AD4DB" supplier="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" client="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8492830E_8275_4640_A08F_A44A8AA0EE1E" supplier="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" client="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-					<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_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_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-						<memberEnd xmi:idref="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
-						<memberEnd xmi:idref="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07" association="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-						</ownedEnd>
-					</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_LI000101_AD07_486d_8D59_3528CDA63AAC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_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_LI000103_2D4C_4dd8_8443_CCD64C72E323" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_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_LI000105_BEA3_4ea4_9F18_96D02FFDCB96" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106_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_LI000107__2E18_40c1_BB08_B80EA400868A" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__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_LI000109__7FF7_41ad_9ACB_A1015C643C97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__7FF7_41ad_9ACB_A1015C643C97" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
-						<memberEnd xmi:idref="EAID_dstA0DAC3_2E18_40c1_BB08_B80EA400868A"/>
-						<memberEnd xmi:idref="EAID_srcA0DAC3_2E18_40c1_BB08_B80EA400868A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA0DAC3_2E18_40c1_BB08_B80EA400868A" association="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
-							<type xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E"/>
-						</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: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_LI000111_2CFF_4c26_9532_EB27449F27A5" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_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_LI000113_3C35_4d9e_90DA_7AFEA316F25B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114_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_LI000115_8B76_44e1_BE3C_78945DDC9AB5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116_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_LI000117_2FEC_42db_A241_77B8583908EF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118_2FEC_42db_A241_77B8583908EF" value="1"/>
-							<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_LI000119_60EE_420d_97ED_66D2A42238A1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120_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_LI000121_7828_42fb_9986_2F847B78C3DA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122_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_LI000123__0D37_48b2_B8F5_8C2924DBDB24" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124__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_LI000125__0D08_45a7_BB5B_816DF773903A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__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_LI000127__60D1_4c6e_8AC0_E18C87C2622B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__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_LI000129__BFB6_40bb_84F1_8A3969FE662E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__BFB6_40bb_84F1_8A3969FE662E" value="1"/>
-						</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_LI000131__4D59_4119_A715_C0AF0EF80B65" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__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_LI000133__3BA3_4795_8084_FD257C99FB89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134__3BA3_4795_8084_FD257C99FB89" value="1"/>
-						</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_LI000135__B834_46d5_A5CA_93F12F0E5824" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__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_LI000137__EF8D_49e2_821D_FF39CCA1773F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138__EF8D_49e2_821D_FF39CCA1773F" 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_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_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_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_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_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_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_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_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_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_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"/>
-						</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_LI000159__836E_494c_A0AF_73F7FB5C8991" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__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"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
-						<memberEnd xmi:idref="EAID_dst6B1F71_0D37_48b2_B8F5_8C2924DBDB24"/>
-						<memberEnd xmi:idref="EAID_src6B1F71_0D37_48b2_B8F5_8C2924DBDB24"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B1F71_0D37_48b2_B8F5_8C2924DBDB24" association="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</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_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_3570E246_3BA3_4795_8084_FD257C99FB89">
-						<memberEnd xmi:idref="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89"/>
-						<memberEnd xmi:idref="EAID_src70E246_3BA3_4795_8084_FD257C99FB89"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src70E246_3BA3_4795_8084_FD257C99FB89" association="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
-						<memberEnd xmi:idref="EAID_dst8C85CC_EF8D_49e2_821D_FF39CCA1773F"/>
-						<memberEnd xmi:idref="EAID_src8C85CC_EF8D_49e2_821D_FF39CCA1773F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C85CC_EF8D_49e2_821D_FF39CCA1773F" association="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
-							<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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4DB5D8_4929_4670_9014_608B3C5534ED" association="EAID_574DB5D8_4929_4670_9014_608B3C5534ED">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" supplier="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<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:Dependency" xmi:id="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" supplier="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854">
-						<memberEnd xmi:idref="EAID_dst2B738F_531D_4495_9397_CE5771200854"/>
-						<memberEnd xmi:idref="EAID_src2B738F_531D_4495_9397_CE5771200854"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B738F_531D_4495_9397_CE5771200854" association="EAID_AF2B738F_531D_4495_9397_CE5771200854">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
-						<memberEnd xmi:idref="EAID_dst8B62CF_836E_494c_A0AF_73F7FB5C8991"/>
-						<memberEnd xmi:idref="EAID_src8B62CF_836E_494c_A0AF_73F7FB5C8991"/>
-					</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_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:Dependency" xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" supplier="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" client="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-						<memberEnd xmi:idref="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9"/>
-						<memberEnd xmi:idref="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9" association="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</ownedEnd>
-					</packagedElement>
-				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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_7C286914_0A87_4d10_9FFD_8653AC16BD03" name="at-voc-new:certification-label-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" name="at-voc-new:tax-category"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" name="at-voc-new:tax-scheme"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" name="at-voc-new:delivery-item-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" name="at-voc-new:item-classification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B0937CD2_46D2_48d7_849F_409BCB726909" name="at-voc-new:dangerous-goods-list"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" name="at-voc-new:activity-code"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" name="at-voc-new:orderable-unit"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" name="at-voc-new:transaction-conditions"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25" name="at-voc-new:vat-category"/>
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" name="datatype">
@@ -962,7 +866,7 @@
 				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F9772628_760B_4fc2_93CE_AA8849709931" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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"/>
@@ -1013,7 +917,7 @@
 			<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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_AE97_5140BE6021A2" x="2159" y="751" width="150" height="40"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_AE97_5140BE6021A2" x="2128" y="737" width="150" height="40"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_AA65_095BEC507C12" modelElement="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_760B_4fc2_AA65_095BEC507C12" text="enumeration"/>
@@ -1022,7 +926,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_B217_37E957B3B448" x="1220" y="70" width="184" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_760B_4fc2_B217_37E957B3B448" x="1220" y="70" width="195" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9772628_760B_4fc2_8057_BBB2E7E570FE" modelElement="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_760B_4fc2_8057_BBB2E7E570FE" text="epo-cat:Brand"/>
@@ -1044,7 +948,7 @@
 				<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="2301" y="530" width="185" height="70"/>
+				<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"/>
@@ -1105,7 +1009,7 @@
 				<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..1" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+				<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"/>
@@ -1201,8 +1105,8 @@
 				<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_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="632"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_A89B_4A966BB6C9D3" x="2219" y="751"/>
+				<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">
@@ -1328,8 +1232,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_B72E_BC6C99FF3009" x="1393" y="65" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B72E_BC6C99FF3009" x="1404" y="87"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B72E_BC6C99FF3009" x="1404" y="87"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B72E_BC6C99FF3009" x="1415" y="87"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B72E_BC6C99FF3009" x="1415" y="87"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_B72E_BC6C99FF3009" x="1425" y="87"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_760B_4fc2_B72E_BC6C99FF3009" x="1425" y="49"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_760B_4fc2_B72E_BC6C99FF3009" x="1385" y="49"/>
@@ -1371,7 +1275,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_760B_4fc2_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_760B_4fc2_B93C_EED975A6974F" x="1573" y="199" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B93C_EED975A6974F" x="1404" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_760B_4fc2_B93C_EED975A6974F" x="1415" y="194"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_760B_4fc2_B93C_EED975A6974F" x="1565" y="194"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_B93C_EED975A6974F" x="1565" y="217"/>
 			</ownedElement>
@@ -1412,7 +1316,7 @@
 				<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_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="2301" y="565"/>
+				<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">
@@ -1440,11 +1344,11 @@
 			</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="1407" y="150" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_760B_4fc2_8070_7102E73439C9" x="1418" y="150" width="135" 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="1404" y="168"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_760B_4fc2_8070_7102E73439C9" x="1415" y="168"/>
 			</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">
@@ -1494,7 +1398,7 @@
 				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DE493AFE_2122_4b99_950A_737EC632B3C5" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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"/>
@@ -1554,7 +1458,7 @@
 			</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="629" y="440" width="104" height="27"/>
+					<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"/>
@@ -1637,7 +1541,7 @@
 			</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="222" y="111" width="182" height="27"/>
+					<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_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"/>
@@ -1648,7 +1552,7 @@
 			</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="281" y="59" width="114" height="27"/>
+					<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_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"/>
@@ -1659,7 +1563,7 @@
 			</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="154" y="389" width="101" height="27"/>
+					<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_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"/>
@@ -1677,7 +1581,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2122_4b99_8076_1ECB982268EE" x="1049" y="574"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4" isFrame="false" modelElement="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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"/>
@@ -1741,9 +1645,9 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_BFB6_4096_AA00_34CA1CC60CA2" text="0..1" modelElement="EAID_dstC9C412_36FA_46d5_AA00_34CA1CC60CA2">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_BFB6_4096_AA00_34CA1CC60CA2" x="511" y="84" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BFB6_4096_AA00_34CA1CC60CA2" x="202" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BFB6_4096_AA00_34CA1CC60CA2" x="148" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_BFB6_4096_AA00_34CA1CC60CA2" x="148" y="77"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_BFB6_4096_AA00_34CA1CC60CA2" x="202" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_BFB6_4096_AA00_34CA1CC60CA2" x="147" y="406"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_BFB6_4096_AA00_34CA1CC60CA2" x="147" y="77"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_BFB6_4096_AA00_34CA1CC60CA2" x="530" y="77"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6D3D469D_BFB6_4096_BB5B_816DF773903A" source="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" target="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" modelElement="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
@@ -1900,126 +1804,140 @@
 				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_82AEC70B_C506_4fe9_9828_22C4B82B893A" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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="607" y="302" width="279" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_B2CE_47C59E700B9D" modelElement="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_B2CE_47C59E700B9D" text="epo-cat:CatalogueFragment"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_B2CE_47C59E700B9D" x="682" y="440" width="129" height="64"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_81FF_2C5D1C5F37D0" x="276" y="454" width="279" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_B217_37E957B3B448" x="329" y="93" width="184" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_B217_37E957B3B448" x="329" y="148" width="195" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_B20D_CD7E6D58150A" modelElement="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_C506_4fe9_B20D_CD7E6D58150A" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_B20D_CD7E6D58150A" text="at-voc-new:activity-code"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_B20D_CD7E6D58150A" x="425" y="449" width="104" height="47"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_B20D_CD7E6D58150A" x="571" y="565" width="104" height="47"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_AD7B_7484B8FDA398" text="adms:Identifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_AD7B_7484B8FDA398" x="638" y="99" width="216" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_AD7B_7484B8FDA398" x="739" y="160" width="216" height="140"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_B8FF_9D9F521B5907" source="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" target="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" modelElement="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C506_4fe9_B8FF_9D9F521B5907" text="+epo-cat:updatesCatalogue" modelElement="EAID_dst809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B8FF_9D9F521B5907" x="722" y="382" width="111" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_B8FF_9D9F521B5907" text="1" modelElement="EAID_dst809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B8FF_9D9F521B5907" x="790" y="366" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B8FF_9D9F521B5907" x="778" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B8FF_9D9F521B5907" x="778" y="361"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_83AB_E27B06BA632B" modelElement="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_83AB_E27B06BA632B" text="epo-cat:PostAwardDocument"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_83AB_E27B06BA632B" x="346" y="366" width="162" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_ACF4_14CE463663E8" source="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" target="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" modelElement="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_ACF4_14CE463663E8" x="706" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_ACF4_14CE463663E8" x="706" y="361"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_8069_6B7EF35512B5" source="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" target="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" modelElement="EAID_CD80377A_4826_4573_8069_6B7EF35512B5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_8069_6B7EF35512B5" x="682" y="470"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_8069_6B7EF35512B5" x="529" y="470"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_82AEC70B_C506_4fe9_8793_87E238D6811B" modelElement="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C506_4fe9_8793_87E238D6811B" text="epo-cat:CatalogueLine"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C506_4fe9_8793_87E238D6811B" x="716" y="422" width="263" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B72E_BC6C99FF3009" x="464" y="60" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B72E_BC6C99FF3009" x="464" y="115" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B72E_BC6C99FF3009" x="501" y="88" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B72E_BC6C99FF3009" x="501" y="143" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B72E_BC6C99FF3009" x="513" y="111"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B72E_BC6C99FF3009" x="513" y="111"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_B72E_BC6C99FF3009" x="525" y="111"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_B72E_BC6C99FF3009" x="525" y="75"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_B72E_BC6C99FF3009" x="493" y="75"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_B72E_BC6C99FF3009" x="493" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C506_4fe9_B72E_BC6C99FF3009" x="493" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B72E_BC6C99FF3009" x="524" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B72E_BC6C99FF3009" x="524" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_B72E_BC6C99FF3009" x="525" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_B72E_BC6C99FF3009" x="525" y="130"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_B72E_BC6C99FF3009" x="493" y="130"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_B72E_BC6C99FF3009" x="493" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C506_4fe9_B72E_BC6C99FF3009" x="493" y="148"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_8018_10297955785C" x="238" y="62" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_8018_10297955785C" x="238" y="117" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_8018_10297955785C" x="326" y="127" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_8018_10297955785C" x="326" y="182" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_8018_10297955785C" x="342" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_8018_10297955785C" x="342" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_8018_10297955785C" x="342" y="77"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_8018_10297955785C" x="303" y="77"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_8018_10297955785C" x="303" y="122"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_8018_10297955785C" x="329" y="122"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C506_4fe9_8018_10297955785C" x="329" y="122"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_8018_10297955785C" x="342" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_8018_10297955785C" x="342" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_8018_10297955785C" x="342" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_8018_10297955785C" x="303" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_8018_10297955785C" x="303" y="177"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_8018_10297955785C" x="329" y="177"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_C506_4fe9_8018_10297955785C" x="329" y="177"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B8FF_34E21440DAD9" x="355" y="55" width="109" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B8FF_34E21440DAD9" x="355" y="110" width="109" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B8FF_34E21440DAD9" x="393" y="88" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B8FF_34E21440DAD9" x="393" y="143" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B8FF_34E21440DAD9" x="440" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B8FF_34E21440DAD9" x="440" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_B8FF_34E21440DAD9" x="440" y="71"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_B8FF_34E21440DAD9" x="385" y="71"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_B8FF_34E21440DAD9" x="385" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_B8FF_34E21440DAD9" x="385" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B8FF_34E21440DAD9" x="440" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B8FF_34E21440DAD9" x="440" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_B8FF_34E21440DAD9" x="440" y="126"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_C506_4fe9_B8FF_34E21440DAD9" x="385" y="126"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_C506_4fe9_B8FF_34E21440DAD9" x="385" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_C506_4fe9_B8FF_34E21440DAD9" x="385" y="148"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_B93C_EED975A6974F" text="+epo:hasUUID" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B93C_EED975A6974F" x="577" y="189" width="59" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_B93C_EED975A6974F" x="678" y="250" width="59" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B93C_EED975A6974F" x="619" y="212" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_B93C_EED975A6974F" x="720" y="273" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B93C_EED975A6974F" x="513" y="207"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B93C_EED975A6974F" x="638" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_B93C_EED975A6974F" x="524" y="268"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_B93C_EED975A6974F" x="739" y="268"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_99CE_63F041A42F06" x="588" y="114" width="36" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_99CE_63F041A42F06" x="689" y="175" width="36" height="27"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_99CE_63F041A42F06" text="0..*" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_99CE_63F041A42F06" x="619" y="154" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_99CE_63F041A42F06" x="720" y="215" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_99CE_63F041A42F06" x="524" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_99CE_63F041A42F06" x="739" y="210"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_A7F9_22D9EFCB1693" x="428" y="454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_A7F9_22D9EFCB1693" x="428" y="401"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_8069_6B7EF35512B5" source="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" target="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" modelElement="EAID_CD80377A_4826_4573_8069_6B7EF35512B5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_8069_6B7EF35512B5" x="425" y="513"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_8069_6B7EF35512B5" x="425" y="592"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_8069_6B7EF35512B5" x="571" y="592"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_9536_602D5F0E8782" text="+epo-cat:comprisesCatalogueLine" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C506_4fe9_9536_602D5F0E8782" x="579" y="465" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C506_4fe9_9536_602D5F0E8782" text="1..*" modelElement="EAID_dstBEA51D_27BB_47b3_9536_602D5F0E8782">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C506_4fe9_9536_602D5F0E8782" x="697" y="488" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_99CE_63F041A42F06" x="513" y="149"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_99CE_63F041A42F06" x="638" y="149"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_9536_602D5F0E8782" x="555" y="483"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_9536_602D5F0E8782" x="716" y="483"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_8B87_E051C3EE7C93" source="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" target="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" modelElement="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C506_4fe9_8B87_E051C3EE7C93" x="863" y="546"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C506_4fe9_8B87_E051C3EE7C93" x="863" y="589"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C506_4fe9_8B87_E051C3EE7C93" x="675" y="589"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_82AEC70B_C506_4fe9_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_C506_4fe9_9723_9C69BB0EB7B4" x="426" y="366"/>
+				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EEFF3272_C785_42be_B2BD_2FB6B7CDF603" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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="350" y="451" width="176" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_847A_7E8C5EEC0432" x="338" y="31" width="176" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_8A6D_3BF200CB4A3C" modelElement="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_8A6D_3BF200CB4A3C" text="epo-cat:CertificationLabel"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_8A6D_3BF200CB4A3C" text="epo:CertificationLabel"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_8A6D_3BF200CB4A3C" x="626" y="307" width="202" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_A9E4_B33CA4DA4C39" modelElement="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_A9E4_B33CA4DA4C39" text="epo-cat:Certificate"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_A9E4_B33CA4DA4C39" text="epo:Certificate"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_A9E4_B33CA4DA4C39" x="279" y="307" width="215" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_99E7_B387A7B402A1" modelElement="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_99E7_B387A7B402A1" text="epo-cat:Certifier"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_99E7_B387A7B402A1" text="epo:Certifier"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_99E7_B387A7B402A1" x="43" y="288" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_9FFD_8653AC16BD03" modelElement="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03">
@@ -2049,26 +1967,25 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_957E_CAC97A45CD53" modelElement="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_957E_CAC97A45CD53" text="foaf:Person"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_957E_CAC97A45CD53" x="133" y="406" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_957E_CAC97A45CD53" x="133" y="414" width="90" height="48"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EEFF3272_C785_42be_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C785_42be_81DD_DA4802D8A322" text="org:Organization"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_81DD_DA4802D8A322" x="0" y="489" width="253" height="124"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C785_42be_81DD_DA4802D8A322" x="260" y="440" width="253" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_9F2B_CD75C658FF42" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" modelElement="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_9F2B_CD75C658FF42" text="+epo:hasCertification" modelElement="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_9F2B_CD75C658FF42" x="290" y="406" width="85" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_9F2B_CD75C658FF42" x="355" y="406" width="85" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_9F2B_CD75C658FF42" text="0..*" modelElement="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_9F2B_CD75C658FF42" x="340" y="379" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_9F2B_CD75C658FF42" x="405" y="379" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_9F2B_CD75C658FF42" x="253" y="554"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_9F2B_CD75C658FF42" x="333" y="554"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C785_42be_9F2B_CD75C658FF42" x="333" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_9F2B_CD75C658FF42" x="398" y="440"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_9F2B_CD75C658FF42" x="398" y="377"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_8357_6957359310FB" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" modelElement="EAID_C3BED690_3A74_4118_8357_6957359310FB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_8357_6957359310FB" text="+epo-cat:attestedByLabel" modelElement="EAID_dstBED690_3A74_4118_8357_6957359310FB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_8357_6957359310FB" x="520" y="337" width="103" height="14"/>
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_8357_6957359310FB" text="+epo:attestedByLabel" modelElement="EAID_dstBED690_3A74_4118_8357_6957359310FB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_8357_6957359310FB" x="535" y="337" width="88" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_8357_6957359310FB" text="1" modelElement="EAID_dstBED690_3A74_4118_8357_6957359310FB">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_8357_6957359310FB" x="618" y="362" width="6" height="14"/>
@@ -2076,23 +1993,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_8357_6957359310FB" x="494" y="357"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_8357_6957359310FB" x="626" y="357"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_829F_004DFE769A97" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_829F_004DFE769A97" text="+epo:hasValidityPeriod" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_829F_004DFE769A97" x="381" y="418" width="93" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_829F_004DFE769A97" text="0..1" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_829F_004DFE769A97" x="434" y="433" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_829F_004DFE769A97" x="426" y="377"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_829F_004DFE769A97" x="426" y="451"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_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_C785_42be_AEDA_E49049545B3B" x="425" y="307"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_AEDA_E49049545B3B" x="425" y="229"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_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_C785_42be_9A77_C246A6F21E71" text="+epo-cat:issuedByCertifier" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_9A77_C246A6F21E71" x="140" y="299" width="67" height="27"/>
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_9A77_C246A6F21E71" text="+epo:issuedByCertifier" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_9A77_C246A6F21E71" x="145" y="315" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_9A77_C246A6F21E71" text="0..1" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_9A77_C246A6F21E71" x="136" y="339" width="17" height="14"/>
@@ -2100,16 +2007,26 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_9A77_C246A6F21E71" x="279" y="334"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_9A77_C246A6F21E71" x="133" y="334"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_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_C785_42be_829F_004DFE769A97" text="+epo:hasValidityPeriod" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_829F_004DFE769A97" x="380" y="146" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_829F_004DFE769A97" text="0..1" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_829F_004DFE769A97" x="442" y="121" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_829F_004DFE769A97" x="430" y="194"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_829F_004DFE769A97" x="430" y="116"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_B5EB_19C2D921F4D1" source="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" target="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" modelElement="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C785_42be_B5EB_19C2D921F4D1" text="+epo:hasCertification" modelElement="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_B5EB_19C2D921F4D1" x="176" y="355" width="85" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C785_42be_B5EB_19C2D921F4D1" x="176" y="348" width="85" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C785_42be_B5EB_19C2D921F4D1" text="0..*" modelElement="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_B5EB_19C2D921F4D1" x="266" y="378" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C785_42be_B5EB_19C2D921F4D1" x="266" y="371" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_B5EB_19C2D921F4D1" x="180" y="406"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_B5EB_19C2D921F4D1" x="180" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C785_42be_B5EB_19C2D921F4D1" x="279" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_B5EB_19C2D921F4D1" x="181" y="414"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_B5EB_19C2D921F4D1" x="181" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C785_42be_B5EB_19C2D921F4D1" x="279" y="363"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EEFF3272_C785_42be_98F1_B3229B558EC4" source="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" target="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" modelElement="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C785_42be_98F1_B3229B558EC4" x="515" y="357"/>
@@ -2145,7 +2062,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C785_42be_AA04_83E4BB664FCB" x="635" y="211"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E" isFrame="false" modelElement="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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"/>
@@ -2341,20 +2258,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E11C_4349_966E_C37D023DC755" x="501" y="396"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC" isFrame="false" modelElement="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC" isFrame="false" modelElement="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9">
 			<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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_AAE9_7F444FFEA26A" x="980" y="284" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_AAE9_7F444FFEA26A" x="1006" y="246" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_93D9_9D4729194EA6" modelElement="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_F3B2_4fbe_93D9_9D4729194EA6" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_93D9_9D4729194EA6" text="at-voc-new:tax-scheme"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_93D9_9D4729194EA6" x="906" y="370" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_93D9_9D4729194EA6" x="1006" y="310" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B200_94202420C754" modelElement="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_B200_94202420C754" text="epo-cat:Item"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_B200_94202420C754" x="634" y="50" width="246" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_B200_94202420C754" x="653" y="50" width="246" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_9313_58C4BB4EB1A7" modelElement="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_9313_58C4BB4EB1A7" text="epo-cat:Line"/>
@@ -2370,27 +2287,41 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3B2_4fbe_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_B1E8_3925D69F40D4" x="659" y="284" width="195" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3B2_4fbe_B1E8_3925D69F40D4" x="678" y="246" width="195" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C09EF9D1_F3B2_4fbe_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<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="701" y="241" width="115" height="14"/>
+					<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_8084_FD257C99FB89" text="0..1" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3B2_4fbe_8084_FD257C99FB89" x="764" y="266" width="100" height="10"/>
+				<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_8084_FD257C99FB89" x="756" y="190"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_8084_FD257C99FB89" x="756" y="284"/>
+				<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_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="540" y="102" width="92" height="14"/>
+					<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_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="626" y="125" width="6" height="14"/>
+					<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_BD03_7B202CFA4807" x="486" y="120"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_BD03_7B202CFA4807" x="634" 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_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_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_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_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"/>
@@ -2416,162 +2347,181 @@
 				<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_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_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_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_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_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_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="755" y="354"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_806C_38F93CA90719" x="755" y="399"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3B2_4fbe_806C_38F93CA90719" x="906" y="399"/>
+				<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_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="854" y="305"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3B2_4fbe_B62C_6F674CDB3888" x="980" y="305"/>
+				<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>
 		</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="674" y="484" width="171" height="103"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_9313_58C4BB4EB1A7" x="497" y="419" width="171" height="103"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_B200_94202420C754" x="1374" y="404" width="246" height="232"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_B200_94202420C754" x="1197" y="339" width="246" height="232"/>
 			</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="648" y="316" width="223" height="80"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_BAD6_EEC96CE5E33A" x="471" y="251" width="223" height="80"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_AD7B_7484B8FDA398" x="1192" y="143" width="216" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_AD7B_7484B8FDA398" x="1015" y="78" width="216" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_8793_87E238D6811B" modelElement="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_8793_87E238D6811B" text="epo-cat:CatalogueLine"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_8793_87E238D6811B" x="966" y="769" width="263" height="114"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_8793_87E238D6811B" x="789" y="704" width="263" height="114"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_99EF_E09436BF89DC" modelElement="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0DB4_45c2_99EF_E09436BF89DC" text="epo-ful:DespatchLine"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_99EF_E09436BF89DC" x="289" y="790" width="271" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_99EF_E09436BF89DC" x="112" y="725" width="271" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_01F32084_0DB4_45c2_960F_C4C98C40706A" modelElement="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
 				<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="714" y="790" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0DB4_45c2_960F_C4C98C40706A" x="537" y="725" 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="1311" y="317" width="121" height="14"/>
+					<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_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="1365" y="289" width="17" height="14"/>
+					<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_873A_F9E88411186D" x="1374" y="435"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_873A_F9E88411186D" x="1341" y="435"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_873A_F9E88411186D" x="1341" y="283"/>
+				<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_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="603" y="807" width="109" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="426" y="742" 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="695" y="830" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="518" y="765" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="560" y="825"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A3AA_B5B7E513AEA0" x="714" y="825"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A3AA_B5B7E513AEA0" x="383" y="760"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A3AA_B5B7E513AEA0" x="537" y="760"/>
 			</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="464" y="790"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B27A_8F69BE5B1455" x="698" y="587"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_B27A_8F69BE5B1455" x="287" y="725"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B27A_8F69BE5B1455" x="521" y="522"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_8A07_9FF99AC0CF07" x="835" y="807" width="129" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_8A07_9FF99AC0CF07" x="658" y="742" width="129" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_8A07_9FF99AC0CF07" text="0..1" modelElement="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_8A07_9FF99AC0CF07" x="947" y="830" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_8A07_9FF99AC0CF07" x="770" y="765" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_8A07_9FF99AC0CF07" x="804" y="825"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_8A07_9FF99AC0CF07" x="966" y="825"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_8A07_9FF99AC0CF07" x="627" y="760"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_8A07_9FF99AC0CF07" x="789" y="760"/>
 			</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="759" y="790"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BCCC_37421BA960DE" x="759" y="587"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BCCC_37421BA960DE" x="582" y="725"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BCCC_37421BA960DE" x="582" y="522"/>
 			</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="1278" y="532" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_BD03_7B202CFA4807" x="1101" y="467" 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="1366" y="556" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_BD03_7B202CFA4807" x="1189" y="491" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD03_7B202CFA4807" x="845" y="551"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD03_7B202CFA4807" x="1374" y="551"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD03_7B202CFA4807" x="668" y="486"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD03_7B202CFA4807" x="1197" y="486"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_9551_9C0C13B80044" x="1163" y="342" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_9551_9C0C13B80044" x="986" y="277" width="66" height="14"/>
 				</ownedElement>
 				<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="1218" y="288" width="17" height="14"/>
+					<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="845" y="519"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_9551_9C0C13B80044" x="1206" y="519"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_9551_9C0C13B80044" x="1206" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_9551_9C0C13B80044" x="668" y="454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_9551_9C0C13B80044" x="1029" y="454"/>
+				<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="1030" y="769"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD51_7717D3E67FCB" x="819" y="587"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_BD51_7717D3E67FCB" x="853" y="704"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_BD51_7717D3E67FCB" x="642" y="522"/>
 			</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="697" y="432" width="101" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_96D4_FF2138630244" x="520" y="367" width="101" 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="766" y="466" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_96D4_FF2138630244" x="589" y="401" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_96D4_FF2138630244" x="758" y="396"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_96D4_FF2138630244" x="758" y="484"/>
+				<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="419"/>
 			</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="1212" y="315" width="88" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1035" y="250" width="88" 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="1253" y="288" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1076" y="223" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1374" y="517"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A49B_8791C8D7CBEA" x="1241" y="517"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A49B_8791C8D7CBEA" x="1241" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A49B_8791C8D7CBEA" x="1197" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A49B_8791C8D7CBEA" x="1064" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A49B_8791C8D7CBEA" x="1064" y="218"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_84F1_8A3969FE662E" x="1258" y="345" width="102" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_84F1_8A3969FE662E" x="1081" y="280" width="102" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_84F1_8A3969FE662E" text="0..1" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_84F1_8A3969FE662E" x="1313" y="287" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_84F1_8A3969FE662E" x="1136" y="222" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_84F1_8A3969FE662E" x="1374" y="481"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_84F1_8A3969FE662E" x="1301" y="481"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_84F1_8A3969FE662E" x="1301" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_84F1_8A3969FE662E" x="1197" y="416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_84F1_8A3969FE662E" x="1124" y="416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_84F1_8A3969FE662E" x="1124" y="218"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_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_0DB4_45c2_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A201_D8391B5C67DF" x="1428" y="230" width="89" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_A201_D8391B5C67DF" x="1251" y="165" width="89" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_A201_D8391B5C67DF" text="0..1" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A201_D8391B5C67DF" x="1411" y="253" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_A201_D8391B5C67DF" x="1234" y="188" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A201_D8391B5C67DF" x="1511" y="404"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A201_D8391B5C67DF" x="1511" y="248"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A201_D8391B5C67DF" x="1408" y="248"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_A201_D8391B5C67DF" x="1334" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_A201_D8391B5C67DF" x="1334" y="183"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_A201_D8391B5C67DF" x="1231" y="183"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_01F32084_0DB4_45c2_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_0DB4_45c2_B51A_14A66F3D627C" text="+epo:hasSerialID" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_B51A_14A66F3D627C" x="1411" y="265" width="69" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0DB4_45c2_B51A_14A66F3D627C" x="1234" y="200" width="69" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0DB4_45c2_B51A_14A66F3D627C" text="0..1" modelElement="EAID_dstC722BA_3236_4fcb_B51A_14A66F3D627C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_B51A_14A66F3D627C" x="1411" y="288" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0DB4_45c2_B51A_14A66F3D627C" x="1234" y="223" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_B51A_14A66F3D627C" x="1485" y="404"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B51A_14A66F3D627C" x="1485" y="283"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_B51A_14A66F3D627C" x="1408" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0DB4_45c2_B51A_14A66F3D627C" x="1308" y="339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0DB4_45c2_B51A_14A66F3D627C" x="1308" y="218"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0DB4_45c2_B51A_14A66F3D627C" x="1231" y="218"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_3FA45701_A0C1_4c43_928C_2F5C3CC87AE2" isFrame="false" modelElement="EAPK_539436E9_1B11_4461_B549_9B764CC4DB6A">
@@ -2772,147 +2722,118 @@
 				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_6F5D743D_50E1_42ee_A0AF_60C2441056C0" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="2" ea_localid="209" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:24:43" modified="2023-07-17 18:24:43" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738" xmi:type="uml:Enumeration" name="at-voc-new:document-type" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-07-17 17:28: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="catalogue"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2023-07-17 18:24:43" modified="2023-07-17 18:24:43"/>
-				<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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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"/>
+					<Dependency xmi:id="EAID_233516AD_8114_473d_B8A6_42826FC39635" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
+					<NoteLink xmi:id="EAID_37004BE7_04CF_4073_8177_20D687239937" start="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_7C2498F5_4923_4199_A897_66E923299404" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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=EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D;"/>
-			</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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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"/>
+			<element xmi:idref="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF" xmi:type="uml:Enumeration" name="at-voc-new:price-type" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2022-12-15 11:47: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="diagrams"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Generalization xmi:id="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4" start="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" end="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7"/>
+					<Dependency xmi:id="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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;"/>
+			<element xmi:idref="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" xmi:type="uml:Enumeration" name="at-voc-new:tax-scheme" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-05-12 11: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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<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_4D92CD55_08CD_4d21_806C_38F93CA90719" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_33A89700_846B_47cb_93D9_9D4729194EA6"/>
 				</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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" 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"/>
+			<element xmi:idref="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" xmi:type="uml:Enumeration" name="at-voc-new:tax-category" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-05-12 11:20: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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Generalization xmi:id="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4" start="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" end="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7"/>
+					<Dependency xmi:id="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A"/>
 				</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_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="1" 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="2023-07-17 18:24:52" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" xmi:type="uml:Class" name="epo-cat:ChargeInformation" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-05-16 17:26:50" 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="diagrams"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
+				<links>
+					<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_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="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_20656DBE_F260_46a2_8674_BEF3C5DC44CB" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="3" ea_localid="207" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:23:49" modified="2023-07-17 18:23:49" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" xmi:type="uml:Class" name="epo-cat:ItemComplementaryRelation" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:21:30" 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="catalogue"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2023-07-17 18:23:49" modified="2023-07-17 18:23:49"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Generalization xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" start="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" xmi:type="uml:Class" name="epo-cat:InformationHub" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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-07-17 18:25:07" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_75741E53_D423_4195_A619_A6477F3A2F70" xmi:type="uml:Class" name="epo-cat:ItemAccessoryRelation" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:21:42" 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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<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_74FDD051_8991_4328_BB5F_DB2625DE81D1" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" 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_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Generalization xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" start="EAID_75741E53_D423_4195_A619_A6477F3A2F70" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" xmi:type="uml:Class" name="epo-cat:Line" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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-07-17 18:25:07" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" xmi:type="uml:Class" name="epo-cat:ItemRelation" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:23: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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_AE25C2FF_DC4C_492c_969F_2EF25B5E086F" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_D469D345_8580_4844_AC6A_B3652BF66F0E" name="epo-cat:hasFactor" 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"/>
-						<model ea_localid="2345" ea_guid="{AE25C2FF-DC4C-492c-969F-2EF25B5E086F}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The number or the fraction of a related item. "/>
+						<model ea_localid="2057" ea_guid="{D469D345-8580-4844-AC6A-B3652BF66F0E}"/>
+						<properties type="xsd:decimal" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -2925,50 +2846,55 @@
 					</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"/>
-					<Association xmi:id="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Generalization xmi:id="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-					<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"/>
+					<Association xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD" start="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15" start="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" start="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" start="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" start="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" start="EAID_75741E53_D423_4195_A619_A6477F3A2F70" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" xmi:type="uml:Class" name="epo-cat:PostAwardDocument" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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 18:25:07" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" xmi:type="uml:Class" name="epo-cat:ItemReplacement" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2022-07-21 16:56: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<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_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Association xmi:id="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Association xmi:id="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" 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_9F9DDC4D_D1D7_4c74_943A_79D432082022" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Generalization xmi:id="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Generalization xmi:id="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Generalization xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" start="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" xmi:type="uml:Class" name="epo-cat:Brand" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" xmi:type="uml:Enumeration" name="at-voc-new:item-classification" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-09-11 18:03: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="catalogue"/>
+				<links>
+					<Dependency xmi:id="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" xmi:type="uml:Class" name="epo-cat:ItemModel" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:23: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_F28E86EC_1E6A_4ca3_92EC_91A96C4446B3" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_2E66D55A_9519_4482_BD71_DFF632D155C2" name="dct:title" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
-						<model ea_localid="2008" ea_guid="{F28E86EC-1E6A-4ca3-92EC-91A96C4446B3}"/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
+						<model ea_localid="2009" ea_guid="{2E66D55A-9519-4482-BD71-DFF632D155C2}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
@@ -2982,43 +2908,28 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" xmi:type="uml:Class" name="epo-cat:CatalogueFragment" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" tpos="3" ea_localid="1942" ea_eleType="element"/>
-				<properties documentation="A part of the Catalogue.&#xA;&#xA;Additional Information:&#xA;The Catalogue fragment generally represents a difference between two Catalogue versions, but there may be other use cases." isSpecification="false" 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-16 16:18:14" modified="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-					<Association xmi:id="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-					<Dependency xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
+					<Association xmi:id="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" xmi:type="uml:Class" name="epo-cat:CertificationLabel" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE" xmi:type="uml:Class" name="epo-cat:Brand" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2022-07-21 16:57: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_E5097931_AB6F_4533_9B27_84455D46F093" name="epo-cat:hasReferenceURI" scope="Public">
+					<attribute xmi:idref="EAID_F28E86EC_1E6A_4ca3_92EC_91A96C4446B3" name="dct:title" scope="Public">
 						<initial/>
-						<documentation value="A reference to where the label specification (norms, expectations, standards and policies) can be found.&#xA;&#xA;WG approval 26/07/2022"/>
-						<model ea_localid="2105" ea_guid="{E5097931-AB6F-4533-9B27-84455D46F093}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+						<model ea_localid="2008" ea_guid="{F28E86EC-1E6A-4ca3-92EC-91A96C4446B3}"/>
+						<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"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -3027,87 +2938,56 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-					<Dependency xmi:id="EAID_B62DE754_3523_45c7_9426_333EF3B4B423" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03"/>
-					<Association xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" xmi:type="uml:Class" name="epo-cat:Certifier" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Association xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" xmi:type="uml:Class" name="epo-cat:ChargeInformation" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<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_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_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" start="EAID_75741E53_D423_4195_A619_A6477F3A2F70" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Association xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" xmi:type="uml:Class" name="epo-cat:Certificate" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" xmi:type="uml:Class" name="epo-cat:Batch" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:25: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_54DC11DF_DA18_4262_A463_6D90A10A85D1" name="epo-cat:hasCertificationNumber" scope="Public">
+					<attribute xmi:idref="EAID_883D9F2F_AD07_486d_8D59_3528CDA63AAC" name="epo-cat:hasManufactureDate" scope="Public">
 						<initial/>
-						<documentation value="The unique identifier of the certificate.&#xA;&#xA;WG approval 26/07/2022"/>
-						<model ea_localid="2090" ea_guid="{54DC11DF-DA18-4262-A463-6D90A10A85D1}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The day of production.&#xA;"/>
+						<model ea_localid="2231" ea_guid="{883D9F2F-AD07-486d-8D59-3528CDA63AAC}"/>
+						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="1" upper="1"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_54479CB6_87F3_4910_BFF6_0EAAC1E6F403" name="epo:hasURL" scope="Public">
+					<attribute xmi:idref="EAID_F894F4EA_2D4C_4dd8_8443_CCD64C72E323" name="epo-cat:hasBestBeforeDate" scope="Public">
 						<initial/>
-						<documentation value="The identifier of a resource.&#xA;&#xA;Additional Information&#xA;&#xA;For example:&#xA;&#xA;1. The URL of the system from where to access the procurement documents;&#xA;2. The URL of the system for the submission of tender documents;&#xA;3. The URL of the system from where to download a tool to communicate with the Buyer;&#xA;4. The URL of the system used by a Technique to allow Economic Operators to exchange information with the Buyer (e.g. eAuction and DPS Systems)&#xA;5. The URL of the system used to exchange information between Buyer and EO for questions and clarifications;&#xA;&#xA;WG Approval 30/09/2019&#xA;"/>
-						<model ea_localid="2086" ea_guid="{54479CB6-87F3-4910-BFF6-0EAAC1E6F403}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The day until which the quality of the item will remain optimal.&#xA;&#xA;WG approval 10/03/2021"/>
+						<model ea_localid="1962" ea_guid="{F894F4EA-2D4C-4dd8-8443-CCD64C72E323}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="4"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_B193D13F_BEA3_4ea4_9F18_96D02FFDCB96" name="epo-cat:hasExpiryDate" scope="Public">
+						<initial/>
+						<documentation value="The last day until which the item can be used.&#xA;&#xA;WG approval 10/03/2021&#xA;"/>
+						<model ea_localid="1961" ea_guid="{B193D13F-BEA3-4ea4-9F18-96D02FFDCB96}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="8"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -3118,50 +2998,76 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-					<Association xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Association xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1"/>
-					<Association xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
-					<Association xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-					<Association xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-					<Association xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Association xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" xmi:type="uml:Class" name="epo-cat:ItemComplementaryRelation" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" xmi:type="uml:Enumeration" name="at-voc-new:activity-code" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-09-01 17:10:34" 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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Generalization xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" start="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Dependency xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
+					<Dependency xmi:id="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" xmi:type="uml:Class" name="epo-cat:ItemComposition" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
+			<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_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2022-02-24 16:21: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="catalogue"/>
+				<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_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" xmi:type="uml:Class" name="epo-cat:Manufacturer" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-04-24 01:05: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Generalization xmi:id="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15" start="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Association xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<NoteLink xmi:id="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
+					<Association xmi:id="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
+				</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_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:27: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
+				<links>
+					<Dependency xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" xmi:type="uml:Class" name="epo-cat:ItemProperty" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" tpos="12" ea_localid="1940" ea_eleType="element"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-07-17 18:24:03" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-14 15:20:37" modified="2023-06-21 16:18: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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
 					<attribute xmi:idref="EAID_F16DE9E2_6233_423a_9884_110D0A949ED9" name="epo-cat:hasAttributeType" scope="Public">
 						<initial/>
@@ -3214,107 +3120,42 @@
 					<Association xmi:id="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5" xmi:type="uml:Class" name="epo-cat:ItemModel" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_2E66D55A_9519_4482_BD71_DFF632D155C2" name="dct:title" scope="Public">
-						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
-						<model ea_localid="2009" ea_guid="{2E66D55A-9519-4482-BD71-DFF632D155C2}"/>
-						<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>
-					<Association xmi:id="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" xmi:type="uml:Class" name="epo-cat:ItemRelation" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" xmi:type="uml:Class" name="epo-cat:ItemComposition" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:22:44" 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_D469D345_8580_4844_AC6A_B3652BF66F0E" name="epo-cat:hasFactor" scope="Public">
-						<initial/>
-						<documentation value="The number or the fraction of a related item. "/>
-						<model ea_localid="2057" ea_guid="{D469D345-8580-4844-AC6A-B3652BF66F0E}"/>
-						<properties type="xsd:decimal" 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>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Association xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD" start="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 					<Generalization xmi:id="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15" start="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					<Generalization xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" start="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					<Generalization xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" start="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					<Generalization xmi:id="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE" start="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					<Generalization xmi:id="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F" start="EAID_75741E53_D423_4195_A619_A6477F3A2F70" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" xmi:type="uml:Class" name="epo-cat:ItemReplacement" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665" start="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" xmi:type="uml:Class" name="epo-cat:ItemRequirement" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" xmi:type="uml:Class" name="epo-cat:ProductSpecification" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2022-07-21 16:57: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Generalization xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" start="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Generalization xmi:id="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" start="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Association xmi:id="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" xmi:type="uml:Class" name="epo-cat:Price" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" tpos="17" ea_localid="1831" ea_eleType="element"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-05-05 15:42:19" modified="2023-03-12 14:16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
 					<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"/>
@@ -3331,54 +3172,84 @@
 					<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_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_7EFC644F_3191_4d57_B035_AE5068C30238" start="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Association xmi:id="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" xmi:type="uml:Class" name="epo-cat:Manufacturer" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Association xmi:id="EAID_31D80540_9E04_44d6_B0B4_339ED74111CC" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Generalization xmi:id="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" start="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<NoteLink xmi:id="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-					<Association xmi:id="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" xmi:type="uml:Class" name="epo-cat:Catalogue" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" xmi:type="uml:Class" name="epo-cat:Item" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:26:18" 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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_FE456683_FF3B_4e45_8E68_393EB2A79185" name="epo-cat:hasSpecificPaymentArrangement" scope="Public">
+					<attribute xmi:idref="EAID_A8D31BA8_2CFF_4c26_9532_EB27449F27A5" name="dct:title" scope="Public">
 						<initial/>
-						<documentation value="Information about payment conditions applied to all items in the catalogue.&#xA;&#xA;Additional information:&#xA;This property may need to be used together with the payment arrangements provided in the ContractTerms, where such terms exists.&#xA;&#xA;WG approval 30/06/2022&#xA;&#xA;"/>
-						<model ea_localid="2069" ea_guid="{FE456683-FF3B-4e45-8E68-393EB2A79185}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
+						<model ea_localid="1952" ea_guid="{A8D31BA8-2CFF-4c26-9532-EB27449F27A5}"/>
+						<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>
+					<attribute xmi:idref="EAID_77A2D19B_3C35_4d9e_90DA_7AFEA316F25B" 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"/>
+						<model ea_localid="1937" ea_guid="{77A2D19B-3C35-4d9e-90DA-7AFEA316F25B}"/>
+						<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>
+					<attribute xmi:idref="EAID_68BA72F5_8B76_44e1_BE3C_78945DDC9AB5" name="epo-cat:hasDimensionDescription" scope="Public">
+						<initial/>
+						<documentation value="Textual description of the item's dimensions."/>
+						<model ea_localid="1964" ea_guid="{68BA72F5-8B76-44e1-BE3C-78945DDC9AB5}"/>
+						<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_9EAF0F75_2FEC_42db_A241_77B8583908EF" name="epo-cat:hasHazardousClass" scope="Public">
+						<initial/>
+						<documentation value="Specification of the hazardous nature of an item according to a classification schema. Provides detail of the classification and nature of a hazardous item."/>
+						<model ea_localid="1968" ea_guid="{9EAF0F75-2FEC-42db-A241-77B8583908EF}"/>
+						<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>
+					<attribute xmi:idref="EAID_62E08CF3_60EE_420d_97ED_66D2A42238A1" name="epo-cat:isInStock" scope="Public">
+						<initial/>
+						<documentation value="Indicator whether an item is in the supplier's stock. If not in stock the supplier has to order the item."/>
+						<model ea_localid="1960" ea_guid="{62E08CF3-60EE-420d-97ED-66D2A42238A1}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="6"/>
+						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
@@ -3386,29 +3257,80 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
+					<attribute xmi:idref="EAID_40D54F27_7828_42fb_9986_2F847B78C3DA" name="epo-cat:hasKeyword" scope="Public">
+						<initial/>
+						<documentation value="List of words (e.g, synonyms) to make the item searchable. &#xA;&#xA;WG Approval 7/04/2022&#xA;"/>
+						<model ea_localid="1956" ea_guid="{40D54F27-7828-42fb-9986-2F847B78C3DA}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="7"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<Association xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-					<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_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-					<Association xmi:id="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
-					<Association xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Generalization xmi:id="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-					<Association xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-					<Association xmi:id="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					<Dependency xmi:id="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<Association xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
+					<Association xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE"/>
+					<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_329E2AC7_4D59_4119_A715_C0AF0EF80B65" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<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_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"/>
+					<Association xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
+					<Association xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<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_C734A9FD_D673_4331_8F43_3A98DA6CD0B7" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5"/>
+					<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_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Association xmi:id="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
+					<Dependency xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2"/>
+					<Association xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD" start="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<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_574DB5D8_4929_4670_9014_608B3C5534ED" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Generalization xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<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="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" xmi:type="uml:Class" name="epo-cat:ItemRequirement" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-03-12 13:23:32" 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="catalogue"/>
+				<links>
+					<Generalization xmi:id="EAID_7709A1E0_223E_493b_935F_A6148890C7E2" start="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" xmi:type="uml:Class" name="epo-cat:CatalogueLine" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" tpos="23" ea_localid="1057" ea_eleType="element"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+				<project author="paula" version="1.0" phase="1.0" created="2021-03-23 15:26:51" modified="2023-03-12 14:15:58" 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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
 					<attribute xmi:idref="EAID_BFF4421D_4A82_4912_8FAB_B8F008971603" name="epo-cat:isOrderable" scope="Public">
 						<initial/>
@@ -3511,134 +3433,43 @@
 					<Generalization xmi:id="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
 					<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"/>
+					<Dependency xmi:id="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93" start="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
 					<Association xmi:id="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
 					<Association xmi:id="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" xmi:type="uml:Class" name="epo-cat:Batch" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" xmi:type="uml:Enumeration" name="at-voc-new:transaction-conditions" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-06-01 20:52: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_883D9F2F_AD07_486d_8D59_3528CDA63AAC" name="epo-cat:hasManufactureDate" scope="Public">
-						<initial/>
-						<documentation value="The day of production.&#xA;"/>
-						<model ea_localid="2231" ea_guid="{883D9F2F-AD07-486d-8D59-3528CDA63AAC}"/>
-						<properties type="xsd:dateTime" 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>
-					<attribute xmi:idref="EAID_F894F4EA_2D4C_4dd8_8443_CCD64C72E323" name="epo-cat:hasBestBeforeDate" scope="Public">
-						<initial/>
-						<documentation value="The day until which the quality of the item will remain optimal.&#xA;&#xA;WG approval 10/03/2021"/>
-						<model ea_localid="1962" ea_guid="{F894F4EA-2D4C-4dd8-8443-CCD64C72E323}"/>
-						<properties type="xsd:date" 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;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_B193D13F_BEA3_4ea4_9F18_96D02FFDCB96" name="epo-cat:hasExpiryDate" scope="Public">
-						<initial/>
-						<documentation value="The last day until which the item can be used.&#xA;&#xA;WG approval 10/03/2021&#xA;"/>
-						<model ea_localid="1961" ea_guid="{B193D13F-BEA3-4ea4-9F18-96D02FFDCB96}"/>
-						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="8"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Association xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<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="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" xmi:type="uml:Class" name="epo-cat:Item" scope="public">
-				<model package="EAPK_20656DBE_F260_46a2_8674_BEF3C5DC44CB" 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="2023-07-17 18:24:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" xmi:type="uml:Class" name="epo-cat:Catalogue" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-04-25 15:54: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<attributes>
-					<attribute xmi:idref="EAID_A8D31BA8_2CFF_4c26_9532_EB27449F27A5" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_FE456683_FF3B_4e45_8E68_393EB2A79185" name="epo-cat:hasSpecificPaymentArrangement" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
-						<model ea_localid="1952" ea_guid="{A8D31BA8-2CFF-4c26-9532-EB27449F27A5}"/>
+						<documentation value="Information about payment conditions applied to all items in the catalogue.&#xA;&#xA;Additional information:&#xA;This property may need to be used together with the payment arrangements provided in the ContractTerms, where such terms exists.&#xA;&#xA;WG approval 30/06/2022&#xA;&#xA;"/>
+						<model ea_localid="2069" ea_guid="{FE456683-FF3B-4e45-8E68-393EB2A79185}"/>
 						<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>
-					<attribute xmi:idref="EAID_77A2D19B_3C35_4d9e_90DA_7AFEA316F25B" 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"/>
-						<model ea_localid="1937" ea_guid="{77A2D19B-3C35-4d9e-90DA-7AFEA316F25B}"/>
-						<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>
-					<attribute xmi:idref="EAID_68BA72F5_8B76_44e1_BE3C_78945DDC9AB5" name="epo-cat:hasDimensionDescription" scope="Public">
-						<initial/>
-						<documentation value="Textual description of the item's dimensions."/>
-						<model ea_localid="1964" ea_guid="{68BA72F5-8B76-44e1-BE3C-78945DDC9AB5}"/>
-						<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_9EAF0F75_2FEC_42db_A241_77B8583908EF" name="epo-cat:hasHazardousClass" scope="Public">
-						<initial/>
-						<documentation value="Specification of the hazardous nature of an item according to a classification schema. Provides detail of the classification and nature of a hazardous item."/>
-						<model ea_localid="1968" ea_guid="{9EAF0F75-2FEC-42db-A241-77B8583908EF}"/>
-						<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/>
@@ -3646,246 +3477,186 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_62E08CF3_60EE_420d_97ED_66D2A42238A1" name="epo-cat:isInStock" scope="Public">
-						<initial/>
-						<documentation value="Indicator whether an item is in the supplier's stock. If not in stock the supplier has to order the item."/>
-						<model ea_localid="1960" ea_guid="{62E08CF3-60EE-420d-97ED-66D2A42238A1}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_40D54F27_7828_42fb_9986_2F847B78C3DA" name="epo-cat:hasKeyword" scope="Public">
-						<initial/>
-						<documentation value="List of words (e.g, synonyms) to make the item searchable. &#xA;&#xA;WG Approval 7/04/2022&#xA;"/>
-						<model ea_localid="1956" ea_guid="{40D54F27-7828-42fb-9986-2F847B78C3DA}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<Association xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967"/>
-					<Association xmi:id="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE"/>
-					<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_329E2AC7_4D59_4119_A715_C0AF0EF80B65" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<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_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"/>
-					<Association xmi:id="EAID_7F6B650B_17CC_499e_A49B_8791C8D7CBEA" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_B0937CD2_46D2_48d7_849F_409BCB726909"/>
-					<Association xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<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_C734A9FD_D673_4331_8F43_3A98DA6CD0B7" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5"/>
-					<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_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-					<Dependency xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2"/>
-					<Association xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629" start="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD" start="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<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_574DB5D8_4929_4670_9014_608B3C5534ED" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" start="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Generalization xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_AF2B738F_531D_4495_9397_CE5771200854" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Generalization xmi:id="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Association xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
+					<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_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
+					<Association xmi:id="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
+					<Association xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Dependency xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
+					<Association xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="4" ea_localid="208" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:24:24" modified="2023-07-17 18:24:24" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" xmi:type="uml:Enumeration" name="at-voc-new:orderable-unit" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="2023-06-01 20: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/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="catalogue"/>
-				<packageproperties version="1.0" tpos="4"/>
-				<paths/>
-				<times created="2023-07-17 18:24:24" modified="2023-07-17 18:24:24"/>
-				<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_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" 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_233516AD_8114_473d_B8A6_42826FC39635" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
-					<NoteLink xmi:id="EAID_37004BE7_04CF_4073_8177_20D687239937" start="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
-				</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_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" 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_A4EABD09_62ED_4add_B6AB_525BE36FDC06" start="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" end="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" xmi:type="uml:Enumeration" name="at-voc-new:certification-label-type" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" tpos="26" ea_localid="1949" ea_eleType="element"/>
-				<properties documentation="* environmental/ecological/green, &#xA;* quality, &#xA;* social, etc." 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-11 20:47:15" modified="2023-07-17 18:24:34" 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_B62DE754_3523_45c7_9426_333EF3B4B423" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03"/>
+					<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_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" xmi:type="uml:Enumeration" name="at-voc-new:tax-category" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_05BF87EB_40D1_4fbc_98CF_2F9920D6FA83" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Dependency xmi:id="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A"/>
+					<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_33A89700_846B_47cb_93D9_9D4729194EA6" xmi:type="uml:Enumeration" name="at-voc-new:tax-scheme" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_7C2498F5_4923_4199_A897_66E923299404" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="controlled vocabularies"/>
-				<links>
-					<Dependency xmi:id="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_33A89700_846B_47cb_93D9_9D4729194EA6"/>
-				</links>
+				<extendedProperties tagged="0" package_name="catalogue" relatedlinks="idref1=;"/>
 			</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_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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"/>
 				<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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<Dependency xmi:id="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2"/>
+					<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_8FD3F177_8104_4fde_AA65_095BEC507C12" xmi:type="uml:Enumeration" name="at-voc-new:item-classification" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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)" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<links>
-					<NoteLink xmi:id="EAID_645676C0_BCB7_41e3_9BA3_E4AE6841A773" start="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" end="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
-					<Dependency xmi:id="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
+					<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_B0937CD2_46D2_48d7_849F_409BCB726909" xmi:type="uml:Enumeration" name="at-voc-new:dangerous-goods-list" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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"/>
 				<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"/>
+				<extendedProperties tagged="0" package_name="catalogue"/>
 				<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"/>
+					<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_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" xmi:type="uml:Enumeration" name="at-voc-new:activity-code" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" tpos="32" ea_localid="1801" 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:23:37" modified="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="0" 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="2023-02-08 17:55: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="controlled vocabularies"/>
-				<links>
-					<Dependency xmi:id="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" start="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" end="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A"/>
-				</links>
+				<extendedProperties tagged="0" package_name="catalogue"/>
+				<packageproperties version="1.0"/>
+				<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="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F" xmi:type="uml:Enumeration" name="at-voc-new:orderable-unit" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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"/>
+				<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"/>
 				<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"/>
+				<extendedProperties tagged="0" package_name="post award object"/>
 				<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"/>
+					<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_74FDD051_8991_4328_BB5F_DB2625DE81D1" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" 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_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_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0" xmi:type="uml:Enumeration" name="at-voc-new:transaction-conditions" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" 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="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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"/>
+				<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"/>
 				<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"/>
+				<extendedProperties tagged="0" package_name="post award object"/>
+				<attributes>
+					<attribute xmi:idref="EAID_AE25C2FF_DC4C_492c_969F_2EF25B5E086F" 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"/>
+						<model ea_localid="2345" ea_guid="{AE25C2FF-DC4C-492c-969F-2EF25B5E086F}"/>
+						<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>
-					<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"/>
+					<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_F2E94395_6882_44e8_BD03_7B202CFA4807" start="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Generalization xmi:id="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" end="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+					<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"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25" xmi:type="uml:Enumeration" name="at-voc-new:vat-category" scope="public">
-				<model package="EAPK_0E0175BE_CF6D_4bc4_94A0_B8F64DDCFF03" tpos="35" ea_localid="1527" 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-01-27 16:29:36" modified="2023-07-17 18:24:34" complexity="1" status="Proposed"/>
+			<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"/>
+				<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"/>
 				<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"/>
+				<extendedProperties tagged="0" package_name="post award object"/>
 				<links>
-					<Dependency xmi:id="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25"/>
+					<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_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Association xmi:id="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Association xmi:id="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5" start="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" 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_9F9DDC4D_D1D7_4c74_943A_79D432082022" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<Generalization xmi:id="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<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_BC521AF3_1D7F_46b3_B0B7_5DEC1EE5E3EF" xmi:type="uml:Package" name="datatype" scope="public">
@@ -3961,362 +3732,55 @@
 				<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;"/>
-				<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/>
-				<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"/>
-					<role visibility="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_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7">
-					<model ea_localid="1971" 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="3225"/>
-				<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_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"/>
-					<role visibility="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:ContextSpecificDescription"/>
-					<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="3960"/>
-				<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_AB038715_CD52_4521_96D4_FF2138630244">
-				<source 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="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
-					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
-					<role name="epo-cat:isSpecificToLine" 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="3962"/>
-				<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:isSpecificToLine"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_014949B1_BE8E_4bef_8E6B_98E657488D49">
-				<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/>
-					<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="3652"/>
-				<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_1A5886B6_3780_442c_B301_604581D5936A">
-				<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;"/>
-					<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="3650"/>
-				<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_1B6003C0_D0B7_432f_8EA3_408BD2086789">
-				<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/>
-					<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="4765"/>
-				<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/>
+			</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/>
-			</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"/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+		</elements>
+		<connectors>
+			<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"/>
 					<role visibility="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_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"/>
+				<target xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738">
+					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-type"/>
+					<role name="epo-cat:hasDocumentType" 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="4054"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3521"/>
+				<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-cat:hasDocumentType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8D08461D_427C_4617_A7FA_357936EA21A8">
-				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
-					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+			<connector xmi:idref="EAID_37004BE7_04CF_4073_8177_20D687239937">
+				<source xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499">
+					<model ea_localid="2633" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4326,8 +3790,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A">
-					<model ea_localid="2585" type="Class" name="epo-cat:InformationHub"/>
+				<target xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738">
+					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-type"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4337,9 +3801,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3360"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4073"/>
+				<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/>
@@ -4348,77 +3812,75 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A76AAA3D_FA92_46df_8905_FDFE3A9A6323">
-				<source xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94">
-					<model ea_localid="2360" type="Class" name="epo-ord:ContractInformation"/>
+			<connector xmi:idref="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06">
+				<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_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"/>
+				<target xmi:idref="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF">
+					<model ea_localid="2200" type="Enumeration" name="at-voc-new:price-type"/>
+					<role name="epo-cat:hasPriceType" 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="3646"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3520"/>
+				<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-cat:hasPriceType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E">
+			<connector xmi:idref="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
 				<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="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_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"/>
+				<target xmi:idref="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
+					<model ea_localid="1965" type="Enumeration" name="at-voc-new:tax-scheme"/>
+					<role name="epo-cat:hasTaxScheme" 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="4622"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3216"/>
+				<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-cat:hasTaxScheme"/>
 				<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_0D4101FD_7720_417c_B62C_6F674CDB3888">
+				<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/>
@@ -4428,9 +3890,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_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
+					<model ea_localid="1964" type="Enumeration" name="at-voc-new:tax-category"/>
+					<role name="epo-cat:hasTaxCategory" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -4439,21 +3901,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="3215"/>
+				<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="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo-cat:hasTaxCategory"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
-				<source xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
-					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+			<connector xmi:idref="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
+				<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/>
@@ -4463,10 +3923,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:specifiesItem" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
+					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
+					<role name="epo-ord:isSpecificToOrderLine" 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;"/>
@@ -4474,89 +3934,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3959"/>
+				<model ea_localid="3649"/>
 				<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:specifiesItem"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
-				<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/>
-					<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="3968"/>
-				<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_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
-				<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/>
-					<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="3969"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Information that is particular to one or multiple Order Lines.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo-ord:isSpecificToOrderLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
+				<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/>
@@ -4566,8 +3958,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
-					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+				<target 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/>
@@ -4577,53 +3969,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3970"/>
+				<model ea_localid="3286"/>
 				<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<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_C3684D7C_E07D_415a_B935_B52376928738">
-					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-type"/>
-					<role name="epo-cat:hasDocumentType" 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="3521"/>
-				<properties ea_type="Dependency" 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-cat:hasDocumentType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8">
-				<source xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+			<connector xmi:idref="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+				<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/>
@@ -4633,10 +3992,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_274424DF_415D_400f_99C0_FDA108C74C7A">
-					<model ea_localid="2788" type="Enumeration" name="at-voc-new:document-status"/>
-					<role name="epo:hasDocumentStatus" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-ful:hasFreightAllowanceCharge" 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;"/>
@@ -4644,87 +4003,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4271"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DocumentStatusCode/"/>
+				<model ea_localid="3948"/>
+				<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:hasDocumentStatus"/>
+				<labels rb="0..*" rt="+epo-ful:hasFreightAllowanceCharge"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
-				<source xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+			<connector xmi:idref="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
+				<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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo:hasPriceSurchargeInformation" 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="4769"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4575"/>
+				<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:hasPriceSurchargeInformation"/>
 				<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"/>
+			<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"/>
 					<role visibility="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_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"/>
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4562"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3289"/>
+				<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-cat:specifiesChargeInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
-				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
-					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+			<connector xmi:idref="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
+				<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/>
@@ -4734,10 +4097,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
-					<role name="epo-ful:hasAssociatedDocument" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
+					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+					<role name="epo-cat:hasChargeInformation" 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;"/>
@@ -4745,56 +4108,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4246"/>
+				<model ea_localid="3214"/>
 				<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:hasAssociatedDocument"/>
+				<labels rb="0..*" rt="+epo-cat:hasChargeInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
-				<source xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
-					<model ea_localid="2117" type="Class" name="epo-ful:DespatchLine"/>
+			<connector xmi:idref="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE">
+				<source xmi:idref="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7">
+					<model ea_localid="1945" type="Class" name="epo-cat:ItemComplementaryRelation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
-					<role name="epo-ful:hasAssociatedDocument" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
+					<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="4433"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3175"/>
+				<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:hasAssociatedDocument"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7EFC644F_3191_4d57_B035_AE5068C30238">
-				<source xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC">
-					<model ea_localid="1715" type="Class" name="epo-cat:ProductSpecification"/>
+			<connector xmi:idref="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F">
+				<source xmi:idref="EAID_75741E53_D423_4195_A619_A6477F3A2F70">
+					<model ea_localid="1944" type="Class" name="epo-cat:ItemAccessoryRelation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4804,8 +4166,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4815,7 +4177,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2915"/>
+				<model ea_localid="3176"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -4826,77 +4188,79 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<connector xmi:idref="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
+				<source xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
 					<role visibility="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_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"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:isRelatedToItem" 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="4563"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3142"/>
+				<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:isRelatedToItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10">
-				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
-					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
+			<connector xmi:idref="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<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"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
+					<role name="epo-cat:hasQualifiedItemRelation" 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="4564"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3145"/>
+				<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-cat:hasQualifiedItemRelation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654">
-				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+			<connector xmi:idref="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15">
+				<source xmi:idref="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016">
+					<model ea_localid="1922" type="Class" name="epo-cat:ItemComposition"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4906,8 +4270,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4917,7 +4281,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4565"/>
+				<model ea_localid="3137"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -4928,44 +4292,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665">
+				<source xmi:idref="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E">
+					<model ea_localid="1943" type="Class" name="epo-cat:ItemReplacement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE">
-					<model ea_localid="1635" type="Class" name="epo-cat:Brand"/>
-					<role name="epo-cat:hasBrand" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
+					<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="2760"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3174"/>
+				<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-cat:hasBrand"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8">
-				<source xmi:idref="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D">
-					<model ea_localid="1942" type="Class" name="epo-cat:CatalogueFragment"/>
+			<connector xmi:idref="EAID_7709A1E0_223E_493b_935F_A6148890C7E2">
+				<source xmi:idref="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167">
+					<model ea_localid="1921" type="Class" name="epo-cat:ItemRequirement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4975,8 +4338,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
+					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -4986,7 +4349,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3170"/>
+				<model ea_localid="3138"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -4997,9 +4360,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907">
-				<source xmi:idref="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D">
-					<model ea_localid="1942" type="Class" name="epo-cat:CatalogueFragment"/>
+			<connector xmi:idref="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3">
+				<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/>
@@ -5009,10 +4372,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
-					<role name="epo-cat:updatesCatalogue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
+					<model ea_localid="1638" type="Enumeration" name="at-voc-new:item-classification"/>
+					<role name="epo-cat:hasItemClassification" 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;"/>
@@ -5020,21 +4383,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3172"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating"/>
+				<model ea_localid="2762"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="A classification of this item according to a specific system for classifying products or services.&#xA;&#xA;Additional information: &#xA;Examples of classification schemes are: CPV, UNSPC, eCl@ss, GPC, ...&#xA;&#xA;WG acceptance 10/03/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:updatesCatalogue"/>
+				<labels rb="0..*" rt="+epo-cat:hasItemClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CD80377A_4826_4573_8069_6B7EF35512B5">
-				<source xmi:idref="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D">
-					<model ea_localid="1942" type="Class" name="epo-cat:CatalogueFragment"/>
+			<connector xmi:idref="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
+				<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/>
@@ -5044,9 +4405,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A">
-					<model ea_localid="1801" type="Enumeration" name="at-voc-new:activity-code"/>
-					<role name="epo-cat:hasActivityCode" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5">
+					<model ea_localid="1636" type="Class" name="epo-cat:ItemModel"/>
+					<role name="epo-cat:hasModel" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5055,53 +4416,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3030"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Code that defines how the line should be applied to an existing eCatalogue.&#xA;"/>
+				<model ea_localid="2761"/>
+				<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:hasActivityCode"/>
+				<labels rb="0..1" rt="+epo-cat:hasModel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5">
-				<source xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-					<model ea_localid="1948" type="Class" name="epo-cat:CertificationLabel"/>
+			<connector xmi:idref="EAID_14F8E397_60D1_4c6e_8AC0_E18C87C2622B">
+				<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;"/>
+					<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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A3E8B06E_AAC4_4ee6_8057_BBB2E7E570FE">
+					<model ea_localid="1635" type="Class" name="epo-cat:Brand"/>
+					<role name="epo-cat:hasBrand" 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="3223"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo-cat:hasBrand"/>
 				<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-cat:CertificationLabel"/>
+			<connector xmi:idref="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
+				<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/>
@@ -5111,30 +4475,32 @@
 					<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-cat:hasLabelType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:isProductionOf" 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 label type such environmental, quality, social etc."/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3194"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="2759"/>
+				<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:hasLabelType"/>
+				<labels rb="1" rt="+epo-cat:isProductionOf"/>
 				<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-cat:Certificate"/>
+			<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/>
@@ -5144,10 +4510,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-					<model ea_localid="1948" type="Class" name="epo-cat:CertificationLabel"/>
-					<role name="epo-cat:attestedByLabel" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -5155,21 +4521,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3192"/>
+				<model ea_localid="3016"/>
 				<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 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="1" rt="+epo-cat:attestedByLabel"/>
+				<labels rb="0..1" rt="+epo:hasBatchID"/>
 				<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-cat:Certificate"/>
+			<connector xmi:idref="EAID_CD80377A_4826_4573_8069_6B7EF35512B5">
+				<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/>
@@ -5179,9 +4545,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
-					<model ea_localid="1951" type="Class" name="epo-cat:Certifier"/>
-					<role name="epo-cat:issuedByCertifier" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A">
+					<model ea_localid="1801" type="Enumeration" name="at-voc-new:activity-code"/>
+					<role name="epo-cat:hasActivityCode" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5190,21 +4556,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3193"/>
-				<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"/>
+				<model ea_localid="3030"/>
+				<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:issuedByCertifier"/>
+				<labels rb="0..1" rt="+epo-cat:hasActivityCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
-				<source xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
-					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+			<connector xmi:idref="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93">
+				<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/>
@@ -5214,10 +4578,10 @@
 					<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-ord:isSpecificToOrderLine" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A">
+					<model ea_localid="1801" type="Enumeration" name="at-voc-new:activity-code"/>
+					<role name="epo-cat:hasActivityCode" 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;"/>
@@ -5225,21 +4589,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3649"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Information that is particular to one or multiple Order Lines.&#xA;"/>
+				<model ea_localid="4830"/>
+				<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-ord:isSpecificToOrderLine"/>
+				<labels rb="0..1" rt="+epo-cat:hasActivityCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D8788651_B092_4dea_82FA_E8F122CD0638">
-				<source xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831">
-					<model ea_localid="1960" type="Class" name="epo-cat:ChargeInformation"/>
+			<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/>
@@ -5249,8 +4611,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
-					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
+				<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/>
@@ -5260,9 +4622,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3286"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<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/>
@@ -5271,9 +4633,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-				<source xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
-					<model ea_localid="2566" type="Class" name="epo-ful:Consignment"/>
+			<connector xmi:idref="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB">
+				<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/>
@@ -5283,9 +4645,9 @@
 					<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:hasFreightAllowanceCharge" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_B0937CD2_46D2_48d7_849F_409BCB726909">
+					<model ea_localid="1620" type="Enumeration" name="at-voc-new:dangerous-goods-list"/>
+					<role name="epo-cat:hasHazardousItemUNDGCode" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5294,21 +4656,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3948"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="2737"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Specification of the hazardous nature of an item according to the UNDG classification schema. Provides detail of the classification and nature of a hazardous item.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-ful:hasFreightAllowanceCharge"/>
+				<labels rb="0..*" rt="+epo-cat:hasHazardousItemUNDGCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4F4A1CD3_A3BC_4cfc_BFCF_A26F9C0B1D38">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<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/>
@@ -5318,9 +4678,9 @@
 					<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:hasPriceSurchargeInformation" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -5329,56 +4689,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4575"/>
+				<model ea_localid="3015"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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:hasPriceSurchargeInformation"/>
+				<labels rb="0..1" rt="+epo:hasManufacturerID"/>
 				<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"/>
+			<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/>
 					<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_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"/>
+				<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="3289"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2725"/>
+				<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-cat:specifiesChargeInformation"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9D9C4956_D3A6_47cd_966E_C37D023DC755">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB">
+				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
+					<model ea_localid="2053" type="Note"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
+					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3338"/>
+				<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/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
+				<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/>
@@ -5388,100 +4781,100 @@
 					<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:hasChargeInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
+					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
+					<role name="epo-cat:hasManufacturer" 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 product maker or service provider."/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3214"/>
+				<model ea_localid="2726"/>
 				<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:hasChargeInformation"/>
+				<labels rb="0..1" rt="+epo-cat:hasManufacturer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FA38F1A3_14F7_454f_8664_9FB0173F017F">
-				<source xmi:idref="EAID_75741E53_D423_4195_A619_A6477F3A2F70">
-					<model ea_localid="1944" type="Class" name="epo-cat:ItemAccessoryRelation"/>
+			<connector xmi:idref="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2">
+					<model ea_localid="1832" type="Enumeration" name="at-voc-new:delivery-item-type"/>
+					<role name="epo-cat:hasDeliveryClassification" 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="3176"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3061"/>
+				<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-cat:hasDeliveryClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
+			<connector xmi:idref="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
+				<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/>
 					<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_B232648D_EE78_45b0_8C41_DD186A53D6A9">
-					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:describesItem" 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="3224"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3167"/>
+				<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:describesItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
+			<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/>
@@ -5491,9 +4884,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:hasValidityPeriod" 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:hasQualifiedValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5502,54 +4895,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3202"/>
+				<model ea_localid="3168"/>
 				<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"/>
+				<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="0..1" rt="+epo:hasValidityPeriod"/>
+				<labels rb="0..1" rt="+epo-cat:hasQualifiedValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_7EFC644F_3191_4d57_B035_AE5068C30238">
+				<source xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC">
+					<model ea_localid="1715" type="Class" name="epo-cat:ProductSpecification"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4578"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2915"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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"/>
-				<extendedProperties/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+			<connector xmi:idref="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
 				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
 					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -5561,9 +4953,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC">
+					<model ea_localid="1715" type="Class" name="epo-cat:ProductSpecification"/>
+					<role name="epo-cat:hasSpecification" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5572,34 +4964,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3201"/>
+				<model ea_localid="2914"/>
 				<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="0..*" rt="+epo-cat:hasSpecification"/>
 				<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_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+				<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=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-cat:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA">
+					<model ea_localid="2040" type="Class" name="epo-ord:AllowanceInformation"/>
+					<role name="epo-ord:hasPriceDiscountInformation" 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;"/>
@@ -5607,124 +4999,126 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4576"/>
+				<model ea_localid="4375"/>
 				<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"/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+epo-ord:hasPriceDiscountInformation"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AA0822D5_319A_4e34_94F3_CF20020C31DE">
-				<source xmi:idref="EAID_C4FD8304_712B_42fb_BC5A_599B637A2FB7">
-					<model ea_localid="1945" type="Class" name="epo-cat:ItemComplementaryRelation"/>
+			<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/>
 					<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_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<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: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;"/>
-					<documentation/>
+					<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."/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3175"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3057"/>
+				<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-cat:hasQuantityThreshold"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_61034AB2_CBA6_4217_BC87_E9E899762D15">
-				<source xmi:idref="EAID_91272730_1D07_41a7_ACDF_37E42C9AF016">
-					<model ea_localid="1922" type="Class" name="epo-cat:ItemComposition"/>
+			<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/>
 					<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_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<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-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;"/>
-					<documentation/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation value="&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3137"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3058"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0692BD51_5113_4e40_A80A_3CDDD84D3629">
-				<source xmi:idref="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4">
-					<model ea_localid="1940" type="Class" name="epo-cat:ItemProperty"/>
+			<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="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_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:describesItem" 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-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="3167"/>
+				<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 rb="1" rt="+epo-cat:describesItem"/>
+				<labels rb="1" rt="+epo-cat:hasPriceValidity"/>
 				<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_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/>
@@ -5734,32 +5128,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:hasQualifiedValue" 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-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="3168"/>
+				<model ea_localid="3055"/>
 				<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="1" rt="+epo-cat:hasNetMonetaryValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C734A9FD_D673_4331_8F43_3A98DA6CD0B7">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<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/>
@@ -5769,9 +5163,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_09632AAB_48D4_4308_9EFD_D1D4C65E36F5">
-					<model ea_localid="1636" type="Class" name="epo-cat:ItemModel"/>
-					<role name="epo-cat:hasModel" 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:hasBaseQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -5780,21 +5174,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2761"/>
+				<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="0..1" rt="+epo-cat:hasModel"/>
+				<labels rb="0..1" rt="+epo-cat:hasBaseQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_06B0C90F_39E1_4d42_9568_8E5CF7B00FDD">
-				<source xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
+			<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/>
@@ -5804,32 +5198,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:isRelatedToItem" 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="3142"/>
+				<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-cat:isRelatedToItem"/>
+				<labels rb="0..1" rt="+epo-cat:hasOrderabableUnitFactorRate"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_14F54CAF_0D08_45a7_BB5B_816DF773903A">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+				<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/>
@@ -5839,10 +5233,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<role name="epo-cat:hasQualifiedItemRelation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo-cat:hasDeliveryLocation" 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;"/>
@@ -5850,89 +5244,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3145"/>
+				<model ea_localid="4714"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Location delivery area where the Item can be ordered to the given price.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-cat:hasQualifiedItemRelation"/>
+				<labels rb="0..1" rt="+epo-cat:hasDeliveryLocation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_75A9B9D4_854D_4945_A08C_69D3DFB2D665">
-				<source xmi:idref="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E">
-					<model ea_localid="1943" type="Class" name="epo-cat:ItemReplacement"/>
+			<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"/>
 					<role visibility="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_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<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="3174"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3291"/>
+				<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-cat:hasPrice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7709A1E0_223E_493b_935F_A6148890C7E2">
-				<source xmi:idref="EAID_BF6CDA1F_72FC_476b_A3AA_F15FF0357167">
-					<model ea_localid="1921" type="Class" name="epo-cat:ItemRequirement"/>
+			<connector xmi:idref="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
+				<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/>
 					<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_FDFD174F_8213_4c86_9BB6_F2AFDC189967">
-					<model ea_localid="1925" type="Class" name="epo-cat:ItemRelation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3138"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3054"/>
+				<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:hasPrice"/>
 				<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"/>
+			<connector xmi:idref="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
+				<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/>
@@ -5942,10 +5338,10 @@
 					<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:hasPriceDiscountInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
+					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+					<role name="epo-cat:hasStandardisedUnitPrice" 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;"/>
@@ -5953,21 +5349,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4375"/>
+				<model ea_localid="3199"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The item price based on a standardised unit.&#xA;&#xA;Additional Information:&#xA;The unit must be indicated in the Quantity, with a quantity value of 1."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasPriceDiscountInformation"/>
+				<labels rb="0..*" rt="+epo-cat:hasStandardisedUnitPrice"/>
 				<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_056C94FE_E7B7_428e_B87E_F0795660EA2B">
+				<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/>
@@ -5977,32 +5373,30 @@
 					<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"/>
+				<target xmi:idref="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
+					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
+					<role name="epo-cat:hasCountryOfOrigin" 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 minimum quantity of the item that can be ordered to the given net monetary value."/>
+					<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;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3057"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2642"/>
+				<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:hasQuantityThreshold"/>
+				<labels rb="0..1" rt="+epo-cat:hasCountryOfOrigin"/>
 				<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_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
+				<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/>
@@ -6012,67 +5406,67 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="dct:requires" 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="&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3058"/>
+				<model ea_localid="3147"/>
 				<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"/>
+				<documentation value="A related resource that is required by the described resource to support its function, delivery, or coherence.&#xA;&#xA;Additional Information:&#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one Item requires another Item. &#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
+				<labels rb="0..*" rt="+dct:requires"/>
 				<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_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=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-cat:hasPriceValidity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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 value="The period of time when the Item can be ordered to the given price.&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1755"/>
+				<model ea_localid="3020"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The identifier for the instance of the concept based on a standard scheme.&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number). &#xA;&#xA;WG Approval 24/02/2022&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-cat:hasPriceValidity"/>
+				<labels rb="0..*" rt="+epo:hasItemStandardID"/>
 				<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_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/>
@@ -6082,45 +5476,45 @@
 					<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_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;"/>
-					<documentation value="The price amount of an Item exclusive of taxes and after substracting price discounts. "/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3055"/>
+				<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-cat:hasNetMonetaryValue"/>
+				<labels rb="0..1" rt="+epo-cat:hasNetQuantity"/>
 				<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_3570E246_3BA3_4795_8084_FD257C99FB89">
+				<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;"/>
+					<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:hasBaseQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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="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;"/>
@@ -6128,21 +5522,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3060"/>
+				<model ea_localid="4561"/>
 				<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"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo-ord:hasTaxInformation"/>
+				<extendedProperties/>
 				<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_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
+				<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/>
@@ -6152,32 +5546,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_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="dct:hasPart" 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="3146"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="A related resource that is included either physically or logically in the described resource.&#xA;&#xA;Additional Information: &#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one item is part of another item.&#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
 				<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="+dct:hasPart"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A4EABD09_62ED_4add_B6AB_525BE36FDC06">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -6187,30 +5581,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E89B28AF_BD5D_429d_9A62_EC5FCB2442FF">
-					<model ea_localid="2200" type="Enumeration" name="at-voc-new:price-type"/>
-					<role name="epo-cat:hasPriceType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:hasAccessoryItem" 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="An additional item that can enhance the original item. &#xA;&#xA;WG Approval: 19/05/2022&#xA;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3520"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="3076"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="An item that can be added to another item to enhance it.&#xA;&#xA;WG Approval: 30/06/2022"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasPriceType"/>
+				<labels rb="0..*" rt="+epo-cat:hasAccessoryItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<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/>
@@ -6220,10 +5616,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo-cat:hasDeliveryLocation" 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;"/>
@@ -6231,21 +5627,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4714"/>
+				<model ea_localid="3201"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Location delivery area where the Item can be ordered to the given 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:hasDeliveryLocation"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
 				<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"/>
+			<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/>
@@ -6255,9 +5651,9 @@
 					<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"/>
+				<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"/>
@@ -6266,21 +5662,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3291"/>
+				<model ea_localid="3019"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value=" The general identifier for the concept as defined by the seller.&#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-cat:hasPrice"/>
+				<labels rb="0..1" rt="+epo:hasSellerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3C28A6D1_3F44_48a1_A013_1A7BA2859AFA">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_AF2B738F_531D_4495_9397_CE5771200854">
+				<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/>
@@ -6290,10 +5686,10 @@
 					<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"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:hasComplementaryItem" 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;"/>
@@ -6301,33 +5697,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3054"/>
+				<model ea_localid="3080"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="An item that if used with another item provides mutual enhancements to both of them.&#xA;&#xA;Additional information:&#xA;For example, gin and tonic; or smart-phone and smart-watch.&#xA;&#xA;WG Approval: 19/05/2022&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo-cat:hasPrice"/>
+				<labels rb="0..*" rt="+epo-cat:hasComplementaryItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5E6E2C47_4590_4730_B50C_8F40D73778CB">
-				<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"/>
+			<connector xmi:idref="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
+				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="dct:replaces" 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;"/>
-					<documentation/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation value="A related resource that is supplanted, displaced, or superseded by the described resource.&#xA;"/>
 					<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:hasStandardisedUnitPrice" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="dct:isReplacedBy" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6336,19 +5732,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3199"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="3079"/>
+				<properties ea_type="Association" direction="Bi-Directional"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The item price based on a standardised unit.&#xA;&#xA;Additional Information:&#xA;The unit must be indicated in the Quantity, with a quantity value of 1."/>
+				<documentation value="A related resource that is supplanted, displaced, or superseded by the described resource.&#xA;&#xA;Additional Information: &#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one item replaces another item. &#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-cat:hasStandardisedUnitPrice"/>
+				<labels lb="0..*" lt="+dct:replaces" rb="0..*" rt="+dct:isReplacedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_455C76C8_B834_46d5_A5CA_93F12F0E5824">
+			<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"/>
@@ -6360,10 +5756,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0B2ADA0F_0895_4cee_BF7A_BF9E5E76BDCC">
-					<model ea_localid="1715" type="Class" name="epo-cat:ProductSpecification"/>
-					<role name="epo-cat:hasSpecification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -6371,21 +5767,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2914"/>
+				<model ea_localid="4374"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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..*" rt="+epo-cat:hasSpecification"/>
+				<labels rb="0..1" rt="+epo:hasSerialID"/>
 				<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_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/>
@@ -6397,7 +5793,7 @@
 				</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"/>
+					<role name="epo:hasManufacturerItemID" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6406,124 +5802,125 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3015"/>
+				<model ea_localid="3018"/>
 				<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 value="This refers to the general identifier for the concept as defined by the manufacturer.&#xA;&#xA;&#xA;WG Approval 16/05/2023&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasManufacturerID"/>
+				<labels rb="0..1" rt="+epo:hasManufacturerItemID"/>
 				<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_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;"/>
+					<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_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="2725"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3522"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="This refers to the identifier for 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/>
+				<labels rb="0..1" rt="+epo:hasBuyerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB">
-				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
-					<model ea_localid="2053" type="Note"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<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="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_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
-					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+				<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 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="3338"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4364"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<documentation/>
+				<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/>
-				<extendedProperties/>
+				<labels rt="+epo-cat:hasExternalSpecification"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F58320C5_899E_4f5f_971B_BF5DE149A892">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71">
+				<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=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
-					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
-					<role name="epo-cat:hasManufacturer" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target 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"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
-					<documentation value="The product maker or service provider."/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2726"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4474"/>
+				<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-cat:hasManufacturer"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_F2E94395_6882_44e8_BD03_7B202CFA4807">
+				<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/>
@@ -6533,10 +5930,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
-					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
-					<role name="epo:specifiesCatalogueReceiver" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
+					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+					<role name="epo-cat:specifiesItem" 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;"/>
@@ -6544,21 +5941,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3452"/>
+				<model ea_localid="3959"/>
 				<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:specifiesCatalogueReceiver"/>
+				<labels rb="1" rt="+epo-cat:specifiesItem"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_727947BB_24E3_4f23_AB2D_F11A323AD4DB">
+				<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/>
@@ -6568,10 +5965,10 @@
 					<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="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_ABDB4F83_303C_49aa_86E4_C7A6A9388FE0">
+					<model ea_localid="1800" type="Enumeration" name="at-voc-new:transaction-conditions"/>
+					<role name="epo-cat:hasTransactionConditionsCode" 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;"/>
@@ -6579,21 +5976,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3456"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3029"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Coded description of the specific transaction conditions (purchasing, sales, payment) for an item.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesSeller"/>
+				<labels rb="0..1" rt="+epo-cat:hasTransactionConditionsCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_8492830E_8275_4640_A08F_A44A8AA0EE1E">
+				<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/>
@@ -6603,9 +5998,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
-					<model ea_localid="1049" type="Class" name="epo:CatalogueProvider"/>
-					<role name="epo:specifiesCatalogueProvider" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_AEFD9686_5D49_4105_AEBB_8004EBB7007F">
+					<model ea_localid="1799" type="Enumeration" name="at-voc-new:orderable-unit"/>
+					<role name="epo-cat:hasOrderableUnit" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6614,21 +6009,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3156"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3028"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The unit in which the item described in this catalogue line can be ordered."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:specifiesCatalogueProvider"/>
+				<labels rb="0..1" rt="+epo-cat:hasOrderableUnit"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<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/>
@@ -6638,10 +6031,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
-					<role name="epo-cat:comprisesCatalogueLine" 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-cat:hasCatalogueLineValidity" 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;"/>
@@ -6649,56 +6042,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1760"/>
+				<model ea_localid="1754"/>
 				<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:comprisesCatalogueLine"/>
+				<labels rb="0..1" rt="+epo-cat:hasCatalogueLineValidity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB">
+				<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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo-cat:isSubordinatedToContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1759"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+					<tags/>
+				</target>
+				<model ea_localid="3970"/>
+				<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-cat:isSubordinatedToContract"/>
+				<labels/>
 				<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"/>
+			<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/>
@@ -6708,10 +6100,10 @@
 					<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="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:hasMinimumQuantityGuaranteedForDelivery" 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;"/>
@@ -6719,21 +6111,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3455"/>
+				<model ea_localid="3026"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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..*" rt="+epo:specifiesBuyer"/>
+				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
-				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
-					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
+			<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/>
@@ -6743,10 +6135,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
-					<role name="epo-ord:refersToCatalogue" 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;"/>
@@ -6754,21 +6146,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3349"/>
+				<model ea_localid="3025"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="&#xA;Additional information:&#xA;If an order refers to multiple catalogues then all these catalogues ideally are subordinated to the same contract. &#xA;Some countries however may allow multiple contracts per order (i.e Italy). "/>
+				<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-ord:refersToCatalogue"/>
+				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_727947BB_24E3_4f23_AB2D_F11A323AD4DB">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+				<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/>
@@ -6778,9 +6170,9 @@
 					<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 name="epo-cat:hasTransactionConditionsCode" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+					<role name="epo-ord:refersToCatalogueLine" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6789,32 +6181,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3029"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Coded description of the specific transaction conditions (purchasing, sales, payment) for an item.&#xA;"/>
+				<model ea_localid="3348"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="&#xA;Additional Information:&#xA;The reference to the catalogue line is for information only, to trace the source of the information provided in the order line. "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasTransactionConditionsCode"/>
+				<labels rb="0..1" rt="+epo-ord:refersToCatalogueLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8492830E_8275_4640_A08F_A44A8AA0EE1E">
-				<source xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+			<connector xmi:idref="EAID_9DBEA51D_27BB_47b3_9536_602D5F0E8782">
+				<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/>
 					<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_AEFD9686_5D49_4105_AEBB_8004EBB7007F">
-					<model ea_localid="1799" type="Enumeration" name="at-voc-new:orderable-unit"/>
-					<role name="epo-cat:hasOrderableUnit" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
+					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
+					<role name="epo-cat:comprisesCatalogueLine" 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;"/>
@@ -6822,89 +6216,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3028"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The unit in which the item described in this catalogue line can be ordered."/>
+				<model ea_localid="1760"/>
+				<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:hasOrderableUnit"/>
+				<labels rb="1..*" rt="+epo-cat:comprisesCatalogueLine"/>
 				<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_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;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_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;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"/>
+				<model ea_localid="4631"/>
+				<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-cat:hasCatalogueLineValidity"/>
+				<labels/>
 				<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_51057DA3_81A5_4e16_A7F9_22D9EFCB1693">
+				<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/>
 					<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-cat:hasMinimumQuantityGuaranteedForDelivery" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3026"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4562"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The minimum quantity of an item that is guaranteed by the seller to be delivered.&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
+				<labels/>
 				<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_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+				<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/>
@@ -6914,9 +6308,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-cat:hasMaximumOrderQuantity" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
+					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
+					<role name="epo:specifiesCatalogueReceiver" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -6925,21 +6319,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3025"/>
+				<model ea_localid="3452"/>
 				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
+				<labels rb="0..1" rt="+epo:specifiesCatalogueReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-				<source xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A">
-					<model ea_localid="2037" type="Class" name="epo-ord:OrderLine"/>
+			<connector xmi:idref="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+				<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/>
@@ -6949,10 +6343,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_28F811B2_B8F5_4649_8793_87E238D6811B">
-					<model ea_localid="1057" type="Class" name="epo-cat:CatalogueLine"/>
-					<role name="epo-ord:refersToCatalogueLine" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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="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;"/>
@@ -6960,21 +6354,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3348"/>
+				<model ea_localid="3456"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="&#xA;Additional Information:&#xA;The reference to the catalogue line is for information only, to trace the source of the information provided in the order line. "/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:refersToCatalogueLine"/>
+				<labels rb="0..*" rt="+epo:specifiesSeller"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A">
-				<source xmi:idref="EAID_44591A4F_71E0_44f5_A739_323DC2A3958E">
-					<model ea_localid="1632" type="Class" name="epo-cat:Batch"/>
+			<connector xmi:idref="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+				<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/>
@@ -6984,10 +6378,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:isProductionOf" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
+					<model ea_localid="1049" type="Class" name="epo:CatalogueProvider"/>
+					<role name="epo:specifiesCatalogueProvider" 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;"/>
@@ -6995,33 +6389,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2759"/>
+				<model ea_localid="3156"/>
 				<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:isProductionOf"/>
+				<labels rb="0..1" rt="+epo:specifiesCatalogueProvider"/>
 				<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_BC94D054_08DB_4bb5_A279_498213B45F8E">
+				<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/>
 					<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:hasBatchID" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo-cat:isSubordinatedToContract" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7030,21 +6424,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3016"/>
+				<model ea_localid="1759"/>
 				<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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBatchID"/>
+				<labels rb="0..1" rt="+epo-cat:isSubordinatedToContract"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -7054,30 +6448,32 @@
 					<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-cat:hasCountryOfOrigin" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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="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 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/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2642"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="3455"/>
+				<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:hasCountryOfOrigin"/>
+				<labels rb="0..*" rt="+epo:specifiesBuyer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
+				<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/>
@@ -7086,10 +6482,10 @@
 					<documentation/>
 					<xrefs/>
 					<tags/>
-				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="dct:requires" visibility="Public" targetScope="instance"/>
+				</source>
+				<target xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
+					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+					<role name="epo-ord:refersToCatalogue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7098,126 +6494,122 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3147"/>
+				<model ea_localid="3349"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A related resource that is required by the described resource to support its function, delivery, or coherence.&#xA;&#xA;Additional Information:&#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one Item requires another Item. &#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
+				<documentation value="&#xA;Additional information:&#xA;If an order refers to multiple catalogues then all these catalogues ideally are subordinated to the same contract. &#xA;Some countries however may allow multiple contracts per order (i.e Italy). "/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+dct:requires"/>
+				<labels rb="0..*" rt="+epo-ord:refersToCatalogue"/>
 				<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_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;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..1" aggregation="none" containment="Unspecified"/>
+				<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;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"/>
+				<model ea_localid="4632"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The identifier for the instance of the concept based on a standard scheme.&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number). &#xA;&#xA;WG Approval 24/02/2022&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasItemStandardID"/>
+				<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_89FDF957_97A3_47f3_98F1_B3229B558EC4">
+				<source xmi:idref="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D">
+					<model ea_localid="1970" 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;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-cat:hasNetQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7">
+					<model ea_localid="1971" 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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3027"/>
-				<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;"/>
+				<model ea_localid="3225"/>
+				<properties ea_type="Generalization" 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:hasNetQuantity"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4561"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3960"/>
+				<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:hasTaxInformation"/>
-				<extendedProperties/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_AB038715_CD52_4521_96D4_FF2138630244">
+				<source 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/>
@@ -7227,9 +6619,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="dct:hasPart" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7">
+					<model ea_localid="2584" type="Class" name="epo-cat:Line"/>
+					<role name="epo-cat:isSpecificToLine" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7238,262 +6630,259 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3146"/>
+				<model ea_localid="3962"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="A related resource that is included either physically or logically in the described resource.&#xA;&#xA;Additional Information: &#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one item is part of another item.&#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+dct:hasPart"/>
+				<labels rb="0..*" rt="+epo-cat:isSpecificToLine"/>
 				<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"/>
+			<connector xmi:idref="EAID_014949B1_BE8E_4bef_8E6B_98E657488D49">
+				<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/>
 					<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_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:hasAccessoryItem" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
-					<documentation value="An additional item that can enhance the original item. &#xA;&#xA;WG Approval: 19/05/2022&#xA;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3076"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3652"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="An item that can be added to another item to enhance it.&#xA;&#xA;WG Approval: 30/06/2022"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-cat:hasAccessoryItem"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7EF1D4F7_398F_4f04_A19A_C5D793FA14E3">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_1A5886B6_3780_442c_B301_604581D5936A">
+				<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;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
-					<model ea_localid="1638" type="Enumeration" name="at-voc-new:item-classification"/>
-					<role name="epo-cat:hasItemClassification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2762"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="A classification of this item according to a specific system for classifying products or services.&#xA;&#xA;Additional information: &#xA;Examples of classification schemes are: CPV, UNSPC, eCl@ss, GPC, ...&#xA;&#xA;WG acceptance 10/03/2022"/>
+				<model ea_localid="3650"/>
+				<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-cat:hasItemClassification"/>
+				<labels/>
 				<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_1B6003C0_D0B7_432f_8EA3_408BD2086789">
+				<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/>
 					<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:hasSellerItemID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3019"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4765"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value=" The general identifier for the concept as defined by the seller.&#xA;&#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:hasSellerItemID"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9E47E1C8_547C_4dfc_AE71_4354D7B1ADDB">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_B0937CD2_46D2_48d7_849F_409BCB726909">
-					<model ea_localid="1620" type="Enumeration" name="at-voc-new:dangerous-goods-list"/>
-					<role name="epo-cat:hasHazardousItemUNDGCode" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
-					<documentation value="Specification of the hazardous nature of an item according to the UNDG classification schema. Provides detail of the classification and nature of a hazardous item.&#xA;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2737"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4054"/>
+				<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-cat:hasHazardousItemUNDGCode"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AF2B738F_531D_4495_9397_CE5771200854">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_8D08461D_427C_4617_A7FA_357936EA21A8">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="epo-cat:hasComplementaryItem" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3080"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3360"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="An item that if used with another item provides mutual enhancements to both of them.&#xA;&#xA;Additional information:&#xA;For example, gin and tonic; or smart-phone and smart-watch.&#xA;&#xA;WG Approval: 19/05/2022&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo-cat:hasComplementaryItem"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="dct:replaces" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_A76AAA3D_FA92_46df_8905_FDFE3A9A6323">
+				<source xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94">
+					<model ea_localid="2360" type="Class" name="epo-ord:ContractInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<type 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 value="A related resource that is supplanted, displaced, or superseded by the described resource.&#xA;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
-					<role name="dct:isReplacedBy" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3079"/>
-				<properties ea_type="Association" direction="Bi-Directional"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3646"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="A related resource that is supplanted, displaced, or superseded by the described resource.&#xA;&#xA;Additional Information: &#xA;In the eCatalogue context, when this relation is used between two items, the resource in the definition refers to Items, i.e. one item replaces another item. &#xA;&#xA;WG Approval: 30/06/2022&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels lb="0..*" lt="+dct:replaces" rb="0..*" rt="+dct:isReplacedBy"/>
+				<labels/>
 				<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_F38D2FE9_AA8F_4ecb_A19A_9A7A0B30CF7E">
+				<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="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_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;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="4622"/>
+				<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_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_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/>
@@ -7505,7 +6894,7 @@
 				</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"/>
+					<role name="adms:identifier" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7514,89 +6903,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3018"/>
+				<model ea_localid="3998"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="This refers to the general identifier for the concept as defined by the manufacturer.&#xA;&#xA;&#xA;WG Approval 16/05/2023&#xA;&#xA;"/>
+				<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="+epo:hasManufacturerItemID"/>
+				<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"/>
+			<connector xmi:idref="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455">
+				<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/>
 					<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:hasBuyerItemID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3522"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3968"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="This refers to the identifier for 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:hasBuyerItemID"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F5E9960A_D7AE_4887_A89B_4A966BB6C9D3">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<connector xmi:idref="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE">
+				<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/>
 					<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_823E0E4B_F4B6_4255_AE97_5140BE6021A2">
-					<model ea_localid="1832" type="Enumeration" name="at-voc-new:delivery-item-type"/>
-					<role name="epo-cat:hasDeliveryClassification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3061"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="3969"/>
+				<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-cat:hasDeliveryClassification"/>
+				<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"/>
+			<connector xmi:idref="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8">
+				<source 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/>
@@ -7606,10 +6995,10 @@
 					<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 aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_274424DF_415D_400f_99C0_FDA108C74C7A">
+					<model ea_localid="2788" type="Enumeration" name="at-voc-new:document-status"/>
+					<role name="epo:hasDocumentStatus" 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;"/>
@@ -7617,21 +7006,19 @@
 					<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;"/>
+				<model ea_localid="4271"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DocumentStatusCode/"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rt="+epo-cat:hasExternalSpecification"/>
+				<labels rb="0..1" rt="+epo:hasDocumentStatus"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71">
-				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+			<connector xmi:idref="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
+				<source 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/>
@@ -7641,8 +7028,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+				<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/>
@@ -7652,7 +7039,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4474"/>
+				<model ea_localid="4769"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -7663,43 +7050,44 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_37004BE7_04CF_4073_8177_20D687239937">
-				<source xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499">
-					<model ea_localid="2633" type="Note"/>
+			<connector xmi:idref="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738">
-					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-type"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+					<role name="epo-ful:hasAssociatedDocument" 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="4073"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4246"/>
+				<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:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888">
-				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
-					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+			<connector xmi:idref="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
+				<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/>
@@ -7709,9 +7097,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
-					<model ea_localid="1964" type="Enumeration" name="at-voc-new:tax-category"/>
-					<role name="epo-cat:hasTaxCategory" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
+					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+					<role name="epo-ful:hasAssociatedDocument" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7720,52 +7108,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3215"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4433"/>
+				<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:hasTaxCategory"/>
+				<labels rb="0..1" rt="+epo-ful:hasAssociatedDocument"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719">
-				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
-					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+			<connector xmi:idref="EAID_9F9DDC4D_D1D7_4c74_943A_79D432082022">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
-					<model ea_localid="1965" type="Enumeration" name="at-voc-new:tax-scheme"/>
-					<role name="epo-cat:hasTaxScheme" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3216"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4563"/>
+				<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-cat:hasTaxScheme"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_645676C0_BCB7_41e3_9BA3_E4AE6841A773">
-				<source xmi:idref="EAID_38C2E543_06D2_464d_8539_9D1E0635944C">
-					<model ea_localid="2851" type="Note"/>
+			<connector xmi:idref="EAID_D8E29289_C54A_4d5e_987B_AEF828189A10">
+				<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/>
@@ -7775,8 +7166,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
-					<model ea_localid="1638" type="Enumeration" name="at-voc-new:item-classification"/>
+				<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/>
@@ -7786,9 +7177,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4368"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4564"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -7797,34 +7188,35 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D">
-				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
-					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
+			<connector xmi:idref="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654">
+				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25">
-					<model ea_localid="1527" type="Enumeration" name="at-voc-new:vat-category"/>
-					<role name="epo-cat:hasVATCategory" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2643"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Value-added tax category of the item.&#xA;"/>
+				<model ea_localid="4565"/>
+				<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-cat:hasVATCategory"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7834,24 +7226,23 @@
 		<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_anyURI" name="xsd:anyURI"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_decimal" name="xsd:decimal"/>
-					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_boolean" name="xsd:boolean"/>
-					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_integer" name="xsd:integer"/>
+					<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 xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_integer" name="xsd:integer"/>
 				</packagedElement>
 			</packagedElement>
 		</primitivetypes>
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_F9772628_760B_4fc2_93CE_AA8849709931">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="125" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="1"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="125" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="1"/>
 				<properties name="catalogue" type="Logical"/>
-				<project author="paula" version="1.0" created="2021-03-23 15:02:56" modified="2023-07-17 17:29:30"/>
+				<project author="paula" version="1.0" created="2021-03-23 15:02:56" modified="2023-09-11 17:57: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=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=1CAC4612;"/>
+				<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=81F77C79;"/>
 				<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/>
@@ -7867,14 +7258,14 @@
 					<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=2301;Top=530;Right=2486;Bottom=600;" subject="EAID_BCDEE6F5_A44E_454a_A6FD_F7B270D8DE17" seqno="12" style="DUID=25C576E2;"/>
+					<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=1404;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=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=2159;Top=751;Right=2309;Bottom=791;" subject="EAID_823E0E4B_F4B6_4255_AE97_5140BE6021A2" seqno="19" style="DUID=4909A0BB;"/>
+					<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;"/>
@@ -7921,7 +7312,7 @@
 					<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=1404:-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=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;"/>
 					<element geometry="SX=0;SY=-43;EX=-72;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=59:CY=14:OX=2: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=1565:-194$;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=37C2F8C4;SOID=ACDC49D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7947,11 +7338,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_DE493AFE_2122_4b99_950A_737EC632B3C5">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="335" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="2"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="335" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="2"/>
 				<properties name="catalogue item price" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-05-05 15:42:01" modified="2023-06-26 18:53:40"/>
+				<project author="lps" version="1.0" created="2022-05-05 15:42:01" modified="2023-09-11 17:58: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=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=3D5E986A;"/>
+				<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;"/>
 				<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/>
@@ -7968,7 +7359,7 @@
 					<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=104:CY=27: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=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=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;"/>
@@ -7976,19 +7367,19 @@
 					<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=182:CY=27:OX=3: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=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=114:CY=27: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=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=101:CY=27:OX=-5: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=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=-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=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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_6D3D469D_BFB6_4096_A024_D98FF37504B4">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="345" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="5"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="345" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="5"/>
 				<properties name="item relations" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-05-19 14:56:33" modified="2023-06-01 20:51:20"/>
+				<project author="lps" version="1.0" created="2022-05-19 14:56:33" modified="2023-09-11 17:58: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=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=3A253370;"/>
+				<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=39344C98;"/>
 				<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/>
@@ -8005,7 +7396,7 @@
 					<element geometry="Left=765;Top=567;Right=890;Bottom=606;" subject="EAID_2A83453A_6317_4d3a_AD67_90AB1BADD69E" seqno="10" style="DUID=0DC2AF98;"/>
 					<element geometry="Left=159;Top=213;Right=422;Bottom=337;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" 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=32A7979A;"/>
 					<element geometry="SX=45;SY=56;EX=-1;EY=-43;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=-16: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=335:-151$;" subject="EAID_F475E438_48A3_41f5_A736_268C91FF8AF2" style="Mode=3;EOID=90F89F64;SOID=32A7979A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=41;EX=0;EY=31;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=-8:OY=0: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=148:-370$148:-77$;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=90F89F64;SOID=B5192489;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=5;EX=0;EY=31;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=-8:OY=0: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=147:-406$147:-77$;" subject="EAID_B9C9C412_36FA_46d5_AA00_34CA1CC60CA2" style="Mode=3;EOID=90F89F64;SOID=B5192489;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=32;SY=-111;EX=32;EY=24;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=105: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_14F54CAF_0D08_45a7_BB5B_816DF773903A" style="Mode=3;EOID=8EB8B94F;SOID=C43474DB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=2;SCTR.LEFT=732;SCTR.TOP=-285;SCTR.RIGHT=918;SCTR.BOTTOM=-265;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69:CY=14:OX=81:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=766:-285$918:-285$918:-265$766:-265$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=C43474DB;SOID=C43474DB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=2;SCTR.LEFT=728;SCTR.TOP=-327;SCTR.RIGHT=917;SCTR.BOTTOM=-307;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=83:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=766:-327$917:-327$917:-307$766:-307$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=C43474DB;SOID=C43474DB;Color=-1;LWidth=0;Hidden=0;"/>
@@ -8025,42 +7416,45 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_82AEC70B_C506_4fe9_9828_22C4B82B893A">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="349" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="4"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="349" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="4"/>
 				<properties name="catalogue update" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-06-16 16:17:13" modified="2023-06-01 20:49:32"/>
+				<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;"/>
-				<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=913EDACB;"/>
+				<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=45F80406;"/>
 				<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=638;Top=99;Right=854;Bottom=239;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="1" style="DUID=E77CB6D0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=425;Top=449;Right=529;Bottom=496;" subject="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" seqno="2" style="DUID=051010F3;NSL=0;"/>
-					<element geometry="Left=329;Top=93;Right=513;Bottom=256;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" 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=4836B501;"/>
-					<element geometry="Left=682;Top=440;Right=811;Bottom=504;" subject="EAID_7C8EFD6D_8430_4f20_B2CE_47C59E700B9D" seqno="4" style="DUID=6F62BED6;"/>
-					<element geometry="Left=607;Top=302;Right=886;Bottom=361;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" 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=60D3A2C5;"/>
-					<element geometry="SX=33;SY=0;EX=32;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=62: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_AB809D8C_0B3B_4e2f_B8FF_9D9F521B5907" style="Mode=3;EOID=60D3A2C5;SOID=6F62BED6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-40;SY=0;EX=-87;EY=-24;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_15FAFE7D_DDD3_424a_ACF4_14CE463663E8" style="Mode=2;EOID=60D3A2C5;SOID=6F62BED6;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=15;EX=34;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=5: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_CD80377A_4826_4573_8069_6B7EF35512B5" style="Mode=3;EOID=051010F3;SOID=6F62BED6;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=493;SCTR.TOP=-111;SCTR.RIGHT=525;SCTR.BOTTOM=-75;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=97:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=513:-111$525:-111$525:-75$493:-75$493:-93$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=303;SCTR.TOP=-122;SCTR.RIGHT=342;SCTR.BOTTOM=-77;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=14:OY=-42:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=342:-93$342:-77$303:-77$303:-122$329:-122$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=385;SCTR.TOP=-104;SCTR.RIGHT=440;SCTR.BOTTOM=-71;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=86:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=440:-93$440:-71$385:-71$385:-93$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=716;Top=422;Right=979;Bottom=546;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" seqno="1" style="DUID=ABE9545E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=346;Top=366;Right=508;Bottom=401;" subject="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" seqno="2" style="DUID=DF775EF0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=739;Top=160;Right=955;Bottom=300;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="3" style="DUID=E77CB6D0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=571;Top=565;Right=675;Bottom=612;" subject="EAID_9699B0FE_6E36_4f6f_B20D_CD7E6D58150A" seqno="4" style="DUID=051010F3;NSL=0;"/>
+					<element geometry="Left=329;Top=148;Right=524;Bottom=311;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" 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=4836B501;"/>
+					<element geometry="Left=276;Top=454;Right=555;Bottom=513;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" 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=60D3A2C5;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=493;SCTR.TOP=-166;SCTR.RIGHT=525;SCTR.BOTTOM=-130;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=97:OY=-15:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=524:-166$525:-166$525:-130$493:-130$493:-148$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=303;SCTR.TOP=-177;SCTR.RIGHT=342;SCTR.BOTTOM=-132;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=14:OY=-42:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=342:-148$342:-132$303:-132$303:-177$329:-177$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=385;SCTR.TOP=-159;SCTR.RIGHT=440;SCTR.BOTTOM=-126;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=86:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=440:-148$440:-126$385:-126$385:-148$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=4836B501;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=9;SY=-38;EX=9;EY=-37;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=2;EOID=E77CB6D0;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-2;SY=20;EX=-2;EY=21;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=36:CY=27:OX=18: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_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=2;EOID=E77CB6D0;SOID=4836B501;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=3;SY=-5;EX=3;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_51057DA3_81A5_4e16_A7F9_22D9EFCB1693" style="Mode=3;EOID=DF775EF0;SOID=60D3A2C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=10;SY=0;EX=0;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103: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=425:-592$;" subject="EAID_CD80377A_4826_4573_8069_6B7EF35512B5" style="Mode=3;EOID=051010F3;SOID=60D3A2C5;Color=-1;LWidth=0;TREE=OR;Hidden=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_9DBEA51D_27BB_47b3_9536_602D5F0E8782" style="Mode=3;EOID=ABE9545E;SOID=60D3A2C5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=16;SY=0;EX=0;EY=-1;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=863:-589$;" subject="EAID_FB97168C_15B3_4870_8B87_E051C3EE7C93" style="Mode=3;EOID=051010F3;SOID=ABE9545E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" style="Mode=3;EOID=4836B501;SOID=DF775EF0;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_EEFF3272_C785_42be_B2BD_2FB6B7CDF603">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="353" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="6"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="353" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="6"/>
 				<properties name="item labels" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-07-11 20:36:17" modified="2023-06-01 21:12:48"/>
+				<project author="andreea" version="1.0" created="2022-07-11 20:36:17" modified="2023-09-11 17:58: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=22969E32;"/>
+				<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=AD06EA0C;"/>
 				<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=0;Top=489;Right=253;Bottom=613;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="1" style="DUID=061145C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=133;Top=406;Right=223;Bottom=476;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="2" style="DUID=CBF8EB1C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=260;Top=440;Right=513;Bottom=564;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="1" style="DUID=061145C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=133;Top=414;Right=223;Bottom=462;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="2" style="DUID=CBF8EB1C;NSL=0;BCol=-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=117;Right=296;Bottom=258;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" 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=7282832A;"/>
 					<element geometry="Left=508;Top=204;Right=522;Bottom=218;" subject="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" seqno="4" style="DUID=9CEC1B28;"/>
 					<element geometry="Left=381;Top=194;Right=471;Bottom=229;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="5" style="DUID=7CB9D470;"/>
@@ -8070,14 +7464,15 @@
 					<element geometry="Left=43;Top=288;Right=133;Bottom=358;" subject="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" seqno="9" style="DUID=591DCB2A;"/>
 					<element geometry="Left=279;Top=307;Right=494;Bottom=377;" subject="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" seqno="10" style="DUID=BA5A33D9;"/>
 					<element geometry="Left=626;Top=307;Right=828;Bottom=377;" subject="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" seqno="11" style="DUID=C5530F55;"/>
-					<element geometry="Left=350;Top=451;Right=526;Bottom=536;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="12" style="DUID=935B2541;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=338;Top=31;Right=514;Bottom=116;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="12" style="DUID=935B2541;NSL=0;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;SCME=1;SCTR=1;EDGE=2;SCTR.LEFT=258;SCTR.TOP=-231;SCTR.RIGHT=447;SCTR.BOTTOM=-211;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=296:-231$447:-231$447:-211$296:-211$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=7282832A;SOID=7282832A;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=-3;EX=-53;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=-5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=333:-554$;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=BA5A33D9;SOID=061145C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=88;SY=-15;EX=0;EY=-15;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-1: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_C3BED690_3A74_4118_8357_6957359310FB" style="Mode=3;EOID=C5530F55;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=4;SY=-33;EX=4;EY=41;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=55: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_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=2;EOID=935B2541;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=512;SCTR.TOP=-466;SCTR.RIGHT=543;SCTR.BOTTOM=-450;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=513:-466$543:-466$543:-450$513:-450$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=061145C0;SOID=061145C0;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=52;SY=3;EX=-1;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=-5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=BA5A33D9;SOID=061145C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=88;SY=-15;EX=0;EY=-15;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=-1: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_C3BED690_3A74_4118_8357_6957359310FB" style="Mode=3;EOID=C5530F55;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=39;SY=35;EX=-1;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=7CB9D470;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-2;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=67:CY=27:OX=4: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_97176015_1FBF_4d9c_9A77_C246A6F21E71" style="Mode=2;EOID=591DCB2A;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=2;SY=0;EX=0;EY=-28;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=6:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=180:-370$;" subject="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" style="Mode=3;EOID=BA5A33D9;SOID=CBF8EB1C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90: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_97176015_1FBF_4d9c_9A77_C246A6F21E71" style="Mode=2;EOID=591DCB2A;SOID=BA5A33D9;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=4;SY=1;EX=4;EY=41;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=50: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_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=2;EOID=935B2541;SOID=7CB9D470;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=3;SY=0;EX=0;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=6:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=181:-363$;" subject="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" style="Mode=3;EOID=BA5A33D9;SOID=CBF8EB1C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=2;SCTR.LEFT=262;SCTR.TOP=-189;SCTR.RIGHT=448;SCTR.BOTTOM=-169;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=296:-189$448:-189$448:-169$296:-169$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=7282832A;SOID=7282832A;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_89FDF957_97A3_47f3_98F1_B3229B558EC4" style="Mode=3;EOID=9CEC1B28;SOID=AF7767A0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-25;EX=-34;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=352:-212$;" subject="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A" style="Mode=3;EOID=BA5A33D9;SOID=7282832A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -8085,12 +7480,12 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=2;SCTR.LEFT=264;SCTR.TOP=-146;SCTR.RIGHT=447;SCTR.BOTTOM=-124;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=296:-146$447:-146$447:-124$296:-124$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=7282832A;SOID=7282832A;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;SCME=1;SCTR=1;EDGE=3;SCTR.LEFT=245;SCTR.TOP=-328;SCTR.RIGHT=447;SCTR.BOTTOM=-257;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=245:-258$245:-328$447:-328$447:-257$296:-257$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=7282832A;SOID=7282832A;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=1;SY=34;EX=1;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" style="Mode=3;EOID=57645BA1;SOID=C5530F55;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=54:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17: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_B62DE754_3523_45c7_9426_333EF3B4B423" style="Mode=3;EOID=3935B2E1;SOID=C5530F55;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=54:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17: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_B62DE754_3523_45c7_9426_333EF3B4B423" style="Mode=3;EOID=3935B2E1;SOID=C5530F55;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=57645BA1;SOID=7CB9D470;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_88441576_E11C_4349_95BE_00842656A68E">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="355" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="7"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="355" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" tpos="7"/>
 				<properties name="tax category" type="Logical"/>
 				<project author="andreea" version="1.0" created="2022-07-14 17:12:00" modified="2023-06-01 20:51: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;"/>
@@ -8130,71 +7525,75 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C09EF9D1_F3B2_4fbe_B445_53E5FCEE7EBC">
-				<model package="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" localID="445" owner="EAPK_6F5D743D_50E1_42ee_A0AF_60C2441056C0" tpos="3"/>
+				<model package="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" localID="445" owner="EAPK_07BDE0AB_A25C_4e1e_8F94_033FFC0D3CC9" 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-05-16 15:51:33"/>
+				<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;"/>
-				<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=5AE200E0;"/>
+				<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=38C259F5;"/>
 				<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=659;Top=284;Right=854;Bottom=354;" 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=35662F97;"/>
-					<element geometry="Left=270;Top=246;Right=533;Bottom=370;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" 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=9610B733;"/>
-					<element geometry="Left=306;Top=446;Right=496;Bottom=510;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="3" style="DUID=7A57AE25;"/>
-					<element geometry="Left=315;Top=85;Right=486;Bottom=155;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="4" style="DUID=772E0362;"/>
-					<element geometry="Left=634;Top=50;Right=880;Bottom=190;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="5" style="DUID=08B4A918;"/>
-					<element geometry="Left=906;Top=370;Right=996;Bottom=430;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="6" style="DUID=AE9CAEDD;"/>
-					<element geometry="Left=980;Top=284;Right=1070;Bottom=344;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="7" style="DUID=FEE62572;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=67:OY=-25:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;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=779;SCTR.TOP=-51;SCTR.RIGHT=810;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=810:-50$810:143$779:143$779:-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=779;SCTR.TOP=-51;SCTR.RIGHT=810;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=810:-50$810:143$779:143$779:-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=779;SCTR.TOP=-51;SCTR.RIGHT=810;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=810:-50$810:143$779:143$779:-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=779;SCTR.TOP=-51;SCTR.RIGHT=810;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=810:-50$810:143$779:143$779:-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=779;SCTR.TOP=-51;SCTR.RIGHT=810;SCTR.BOTTOM=143;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=810:-50$810:143$779:143$779:-50$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=08B4A918;SOID=08B4A918;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="Left=642;Top=430;Right=909;Bottom=528;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" 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=9765D7A2;"/>
+					<element geometry="Left=678;Top=246;Right=873;Bottom=370;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" 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=35662F97;"/>
+					<element geometry="Left=270;Top=246;Right=533;Bottom=370;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" 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=9610B733;"/>
+					<element geometry="Left=306;Top=446;Right=496;Bottom=510;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="4" style="DUID=7A57AE25;"/>
+					<element geometry="Left=315;Top=85;Right=486;Bottom=155;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="5" style="DUID=772E0362;"/>
+					<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;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="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=-1;SY=0;EX=0;EY=1;EDGE=3;$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=755:-399$;" 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=-79;SY=-17;EX=4;EY=13;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=9: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=FEE62572;SOID=35662F97;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_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="2023-07-17 17:22:16"/>
+				<project author="lps" version="1.0" created="2023-01-23 17:51:48" modified="2023-09-11 18:00: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=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=9C002FA4;"/>
+				<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=81AFD911;"/>
 				<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=714;Top=790;Right=804;Bottom=860;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="1" style="DUID=81272805;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=289;Top=790;Right=560;Bottom=860;" 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=966;Top=769;Right=1229;Bottom=883;" 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=1192;Top=143;Right=1408;Bottom=283;" 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=648;Top=316;Right=871;Bottom=396;" subject="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" seqno="5" style="DUID=610541B9;"/>
-					<element geometry="Left=1374;Top=404;Right=1620;Bottom=636;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="6" style="DUID=DCE51368;NSL=0;"/>
-					<element geometry="Left=674;Top=484;Right=845;Bottom=587;" 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=1341:-435$;" subject="EAID_E507D198_1A41_4b43_873A_F9E88411186D" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=537;Top=725;Right=627;Bottom=795;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="1" style="DUID=81272805;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=112;Top=725;Right=383;Bottom=795;" 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=704;Right=1052;Bottom=818;" 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=471;Top=251;Right=694;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=522;" 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;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A88D0B55_1D01_4b73_B27A_8F69BE5B1455" style="Mode=3;EOID=A3F6F114;SOID=4DA8219C;Color=-1;LWidth=0;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=72;SY=-16;EX=0;EY=-37;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=16;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=1206:-519$;" 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=2;SX=0;SY=16;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:-454$;" 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;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C33C0B35_4ADE_463d_BD51_7717D3E67FCB" style="Mode=3;EOID=A3F6F114;SOID=1036BB38;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=32;EX=0;EY=47;EDGE=2;SCTR.LEFT=1597;SCTR.TOP=-488;SCTR.RIGHT=1665;SCTR.BOTTOM=-473;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1620:-488$1665:-488$1665:-473$1620:-473$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" 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;"/>
 					<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=3;EX=-59;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=1241:-517$;" 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=39;EX=1;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=1301:-481$;" 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=1597;SCTR.TOP=-618;SCTR.RIGHT=1700;SCTR.BOTTOM=-544;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1620:-618$1700:-618$1700:-544$1620:-544$;" 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=1524;SCTR.TOP=-728;SCTR.RIGHT=1555;SCTR.BOTTOM=-635;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1524:-636$1524:-728$1555:-728$1555:-636$;" 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=1597;SCTR.TOP=-447;SCTR.RIGHT=1646;SCTR.BOTTOM=-423;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1620:-447$1646:-447$1646:-423$1620:-423$;" 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=1511:-248$;" subject="EAID_ECEFDC69_19B4_47d7_A201_D8391B5C67DF" style="Mode=3;EOID=95A890E3;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<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=1485:-283$;" 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=1597;SCTR.TOP=-416;SCTR.RIGHT=1645;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1620:-416$1645:-416$1645:-401$1597:-401$1597:-404$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=DCE51368;SOID=DCE51368;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=0;SY=3;EX=-59;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=1064:-452$;" 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=39;EX=1;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=1124:-416$;" 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="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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_3FA45701_A0C1_4c43_928C_2F5C3CC87AE2">
diff --git a/implementation/eContract/xmi_conceptual_model/eContract_CM.xml b/implementation/eContract/xmi_conceptual_model/eContract_CM.xml
index 90f58974..c2fdbc1f 100644
--- a/implementation/eContract/xmi_conceptual_model/eContract_CM.xml
+++ b/implementation/eContract/xmi_conceptual_model/eContract_CM.xml
@@ -4,122 +4,127 @@
 	<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" 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>
+				<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 xmi:type="uml:Class" xmi:id="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" name="epo-con:Deliverable">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F" name="epo:hasTotalValue" association="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
+						<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001__44A0_4944_8E1A_EF574D760E6F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__44A0_4944_8E1A_EF574D760E6F" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971" name="epo-cat:hasQuantity" association="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__C54C_4c80_88A3_D705701F1971" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__C54C_4c80_88A3_D705701F1971" value="1"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" general="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_7D231541_CF98_401a_A2AD_524FE8266EF5" 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:hasRestatedContractValue" association="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000001__C843_497f_B19D_1727246FC1BD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__C843_497f_B19D_1727246FC1BD" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" name="epo:amendsContract" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__15E8_4ec4_876B_BEE9D986B4DA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__15E8_4ec4_876B_BEE9D986B4DA" value="1"/>
-						</ownedAttribute>
-					</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_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-						<memberEnd xmi:idref="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
-						<memberEnd xmi:idref="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-							<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
-						<memberEnd xmi:idref="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103"/>
-						<memberEnd xmi:idref="EAID_src5EFF4E_D969_4688_8461_8385AB23B103"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EFF4E_D969_4688_8461_8385AB23B103" association="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
-							<type xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
-						<memberEnd xmi:idref="EAID_dst410E27_20ED_475c_B079_4FE5372221E4"/>
-						<memberEnd xmi:idref="EAID_src410E27_20ED_475c_B079_4FE5372221E4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src410E27_20ED_475c_B079_4FE5372221E4" association="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" name="epo-con:ContractModificationInformation">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6270C670_D8E8_4ed1_A970_FD5A00279762" name="epo:hasModificationDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_D8E8_4ed1_A970_FD5A00279762" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_D8E8_4ed1_A970_FD5A00279762" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_34405F3E_A7B7_4a77_9A62_BE3E7C7CEB83" name="epo:hasModificationReasonDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_A7B7_4a77_9A62_BE3E7C7CEB83" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_A7B7_4a77_9A62_BE3E7C7CEB83" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103" name="epo:concernsContractAmendment" association="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
-							<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009__D969_4688_8461_8385AB23B103" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010__D969_4688_8461_8385AB23B103" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4EE008_B895_41f1_B319_1174DD83D564" name="epo:relatesToEFormSectionIdentifier" association="EAID_774EE008_B895_41f1_B319_1174DD83D564">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__B895_41f1_B319_1174DD83D564" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__B895_41f1_B319_1174DD83D564" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					</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:Dependency" xmi:id="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" supplier="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" client="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" name="epo-con:Deliverable">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F" name="epo:hasTotalValue" association="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__44A0_4944_8E1A_EF574D760E6F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__44A0_4944_8E1A_EF574D760E6F" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971" name="epo-cat:hasQuantity" association="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__C54C_4c80_88A3_D705701F1971" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__C54C_4c80_88A3_D705701F1971" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" general="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					</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_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_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-						<memberEnd xmi:idref="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
-						<memberEnd xmi:idref="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A" association="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</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_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_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+					<memberEnd xmi:idref="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
+					<memberEnd xmi:idref="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A" association="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+						<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					</ownedEnd>
+				</packagedElement>
+				<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"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005__C843_497f_B19D_1727246FC1BD" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__C843_497f_B19D_1727246FC1BD" value="1"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" name="epo:amendsContract" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+						<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007__15E8_4ec4_876B_BEE9D986B4DA" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008__15E8_4ec4_876B_BEE9D986B4DA" value="1"/>
+					</ownedAttribute>
+				</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_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+					<memberEnd xmi:idref="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
+					<memberEnd xmi:idref="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+						<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
+					<memberEnd xmi:idref="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103"/>
+					<memberEnd xmi:idref="EAID_src5EFF4E_D969_4688_8461_8385AB23B103"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EFF4E_D969_4688_8461_8385AB23B103" association="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
+						<type xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
+					<memberEnd xmi:idref="EAID_dst410E27_20ED_475c_B079_4FE5372221E4"/>
+					<memberEnd xmi:idref="EAID_src410E27_20ED_475c_B079_4FE5372221E4"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src410E27_20ED_475c_B079_4FE5372221E4" association="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
+						<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" name="epo-con:ContractModificationInformation">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_6270C670_D8E8_4ed1_A970_FD5A00279762" name="epo:hasModificationDescription">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_D8E8_4ed1_A970_FD5A00279762" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_D8E8_4ed1_A970_FD5A00279762" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_34405F3E_A7B7_4a77_9A62_BE3E7C7CEB83" name="epo:hasModificationReasonDescription">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011_A7B7_4a77_9A62_BE3E7C7CEB83" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012_A7B7_4a77_9A62_BE3E7C7CEB83" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103" name="epo:concernsContractAmendment" association="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
+						<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__D969_4688_8461_8385AB23B103" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__D969_4688_8461_8385AB23B103" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst4EE008_B895_41f1_B319_1174DD83D564" name="epo:relatesToEFormSectionIdentifier" association="EAID_774EE008_B895_41f1_B319_1174DD83D564">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__B895_41f1_B319_1174DD83D564" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__B895_41f1_B319_1174DD83D564" value="1"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+				</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:Dependency" xmi:id="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" supplier="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" client="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7"/>
+			</packagedElement>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" name="datatype">
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_6AC6185D_A375_4613_AFCB_66A3B11BB38F" name="rdf:PlainLiteral"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_23AD5812_9624_4cbc_A559_DABF00944929" name="xsd:anyURI"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_E4601C78_01E7_4919_AA4D_221EF3851EAA" name="xsd:boolean"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_EA826A3E_6246_47cf_8761_15FFA2CD7E45" name="xsd:date"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_A13336A0_37D5_43cd_94D4_876797E1E87C" name="xsd:dateTime"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_E00B355C_D5C5_47f3_B950_E21372EF9B21" name="xsd:decimal"/>
+				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -227,7 +232,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_665B_43db_B319_1174DD83D564" x="247" y="456"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0" isFrame="false" modelElement="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -335,6 +340,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_8F66_FA023FA190E7" x="828" y="553"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_8F66_FA023FA190E7" x="828" y="713"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_850E_F68332FB1B0B" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_850E_F68332FB1B0B" x="1513" y="1049"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_850E_F68332FB1B0B" x="1384" y="1049"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1661_4ff0_99CE_63F041A42F06" x="392" y="279" width="66" height="14"/>
@@ -403,9 +412,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_8AE5_E5806C9B2562" x="974" y="487"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_8AE5_E5806C9B2562" x="1520" y="487"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_850E_F68332FB1B0B" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_850E_F68332FB1B0B" x="1513" y="1049"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_850E_F68332FB1B0B" x="1384" y="1049"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1661_4ff0_B8FF_34E21440DAD9" x="1200" y="189" width="109" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1661_4ff0_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1661_4ff0_B8FF_34E21440DAD9" x="1248" y="226" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="205"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="205"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_A885_D5B3B1D5960A" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" modelElement="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1661_4ff0_A885_D5B3B1D5960A" text="+epo:bindsContractor" modelElement="EAID_dst8CA809_26BC_46b1_A885_D5B3B1D5960A">
@@ -589,19 +608,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_9F41_FE45FA8A0605" x="1030" y="762"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_9F41_FE45FA8A0605" x="870" y="762"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1661_4ff0_B8FF_34E21440DAD9" x="1200" y="189" width="109" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1661_4ff0_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1661_4ff0_B8FF_34E21440DAD9" x="1248" y="226" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1661_4ff0_B8FF_34E21440DAD9" x="1283" y="205"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="205"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1661_4ff0_B8FF_34E21440DAD9" x="1240" y="231"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_B447_89D7A813874C" x="600" y="919"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_B447_89D7A813874C" x="600" y="880"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_ADCE_908A980E0342" x="780" y="744"/>
@@ -622,6 +631,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_A1C6_F384FEC304AE" x="284" y="691"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_A1C6_F384FEC304AE" x="284" y="553"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1661_4ff0_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1661_4ff0_AD37_79213AD539C8" x="469" y="1025" width="100" height="10"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1661_4ff0_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1661_4ff0_AD37_79213AD539C8" x="673" y="1048" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_AD37_79213AD539C8" x="301" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_AD37_79213AD539C8" x="301" y="1043"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1661_4ff0_AD37_79213AD539C8" x="692" y="1043"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_9190_197D4A4F4C63" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1661_4ff0_9190_197D4A4F4C63" x="285" y="818"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_9190_197D4A4F4C63" x="285" y="860"/>
@@ -653,10 +673,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1661_4ff0_B72E_BC6C99FF3009" x="1327" y="267"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1661_4ff0_B72E_BC6C99FF3009" x="1327" y="267"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_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_1661_4ff0_B447_89D7A813874C" x="600" y="919"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1661_4ff0_B447_89D7A813874C" x="600" y="880"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_790B14E6_1661_4ff0_8D4A_95B9DD217458" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1661_4ff0_8D4A_95B9DD217458" text="+epo:providesContractTotalPaymentValue" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1661_4ff0_8D4A_95B9DD217458" x="966" y="1021" width="147" height="27"/>
@@ -669,7 +685,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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2C0665CA_A78A_491e_88BC_180C3572A077" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -740,7 +756,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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_3ABE52BE_CE2B_411b_8587_0CE199619F12" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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="136"/>
@@ -755,15 +771,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B8D8_207479C15419" x="207" y="210" width="219" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B8D8_207479C15419" x="284" y="210" width="219" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B4D4_D8AE4F96B00B" x="207" y="545" width="178" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B4D4_D8AE4F96B00B" x="284" y="545" width="178" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_8AC2_D7789CCFB7F8" x="1139" y="475" width="273" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_8AC2_D7789CCFB7F8" x="1080" y="475" width="273" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_8DD1_1E65B7299BE7" modelElement="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_8DD1_1E65B7299BE7" text="epo:Contractor"/>
@@ -771,110 +787,110 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_9655_04521F703750" text="epo:Buyer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_9655_04521F703750" x="1166" y="211" width="219" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_9655_04521F703750" x="1107" y="211" width="219" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_B4CE_1CC777975EF3" modelElement="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_B4CE_1CC777975EF3" text="epo:Winner"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B4CE_1CC777975EF3" x="251" y="660" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B4CE_1CC777975EF3" x="328" y="660" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_3ABE52BE_CE2B_411b_B795_B4D7DEE0BA53" modelElement="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_CE2B_411b_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B795_B4D7DEE0BA53" x="82" y="490" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_CE2B_411b_B795_B4D7DEE0BA53" x="159" y="490" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_BF9B_6F607A63A921" source="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" target="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" modelElement="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_BF9B_6F607A63A921" text="+epo:needsToBeATenderer" modelElement="EAID_dst636EE3_DE81_4083_BF9B_6F607A63A921">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_BF9B_6F607A63A921" x="74" y="584" width="110" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_BF9B_6F607A63A921" x="151" y="584" width="110" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_BF9B_6F607A63A921" text="0..1" modelElement="EAID_dst636EE3_DE81_4083_BF9B_6F607A63A921">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_BF9B_6F607A63A921" x="133" y="565" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_BF9B_6F607A63A921" x="210" y="565" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_BF9B_6F607A63A921" x="251" y="674"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_BF9B_6F607A63A921" x="121" y="674"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_BF9B_6F607A63A921" x="121" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_BF9B_6F607A63A921" x="328" y="674"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_BF9B_6F607A63A921" x="198" y="674"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_BF9B_6F607A63A921" x="198" y="560"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_A14D_2E0BE4C98649" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_A14D_2E0BE4C98649" text="+epo:signsAwardDecision" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A14D_2E0BE4C98649" x="1217" y="435" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A14D_2E0BE4C98649" x="1158" y="435" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_A14D_2E0BE4C98649" text="0..*" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A14D_2E0BE4C98649" x="1283" y="457" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A14D_2E0BE4C98649" x="1224" y="457" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A14D_2E0BE4C98649" x="1275" y="296"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A14D_2E0BE4C98649" x="1275" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A14D_2E0BE4C98649" x="1216" y="296"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A14D_2E0BE4C98649" x="1216" y="475"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_BCF2_6CA4F71150CA" source="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" target="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" modelElement="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_BCF2_6CA4F71150CA" text="+epo:needsToBeAWinner" modelElement="EAID_dstA3014F_919D_4de3_BCF2_6CA4F71150CA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_BCF2_6CA4F71150CA" x="145" y="691" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_BCF2_6CA4F71150CA" x="222" y="691" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_BCF2_6CA4F71150CA" text="0..1" modelElement="EAID_dstA3014F_919D_4de3_BCF2_6CA4F71150CA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_BCF2_6CA4F71150CA" x="232" y="711" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_BCF2_6CA4F71150CA" x="309" y="711" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_BCF2_6CA4F71150CA" x="809" y="99"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_BCF2_6CA4F71150CA" x="59" y="99"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_BCF2_6CA4F71150CA" x="59" y="706"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_CE2B_411b_BCF2_6CA4F71150CA" x="251" y="706"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_BCF2_6CA4F71150CA" x="147" y="99"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_BCF2_6CA4F71150CA" x="147" y="706"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_CE2B_411b_BCF2_6CA4F71150CA" x="328" y="706"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_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_CE2B_411b_9C45_B9A2F9CBFE43" text="+epo:concernsTender" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9C45_B9A2F9CBFE43" x="202" y="331" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9C45_B9A2F9CBFE43" x="279" y="331" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_9C45_B9A2F9CBFE43" text="1" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_9C45_B9A2F9CBFE43" x="258" y="300" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_9C45_B9A2F9CBFE43" x="335" y="300" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9C45_B9A2F9CBFE43" x="246" y="545"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9C45_B9A2F9CBFE43" x="246" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9C45_B9A2F9CBFE43" x="323" y="545"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9C45_B9A2F9CBFE43" x="323" y="295"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_A3E6_B0420EB7CF2A" source="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" target="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" modelElement="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_A3E6_B0420EB7CF2A" text="+epo:indicatesAwardToWinner" modelElement="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A3E6_B0420EB7CF2A" x="254" y="620" width="124" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A3E6_B0420EB7CF2A" x="331" y="620" width="124" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_A3E6_B0420EB7CF2A" text="0..1" modelElement="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A3E6_B0420EB7CF2A" x="304" y="642" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A3E6_B0420EB7CF2A" x="381" y="642" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A3E6_B0420EB7CF2A" x="296" y="604"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A3E6_B0420EB7CF2A" x="296" y="660"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A3E6_B0420EB7CF2A" x="373" y="604"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A3E6_B0420EB7CF2A" x="373" y="660"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9B16_DD484C6E2547" x="385" y="350" width="96" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9B16_DD484C6E2547" x="404" y="354" width="96" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_9B16_DD484C6E2547" text="1" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_9B16_DD484C6E2547" x="501" y="378" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9B16_DD484C6E2547" x="320" y="295"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9B16_DD484C6E2547" x="320" y="373"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9B16_DD484C6E2547" x="397" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9B16_DD484C6E2547" x="397" y="373"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_9B16_DD484C6E2547" x="509" y="373"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_9F78_AF7887C44E46" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" modelElement="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_9F78_AF7887C44E46" text="+epo:isSubmitedBy" modelElement="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9F78_AF7887C44E46" x="82" y="453" width="78" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_9F78_AF7887C44E46" x="159" y="453" width="78" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_9F78_AF7887C44E46" text="0..1" modelElement="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_9F78_AF7887C44E46" x="129" y="472" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_9F78_AF7887C44E46" x="206" y="472" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9F78_AF7887C44E46" x="207" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9F78_AF7887C44E46" x="121" y="259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_9F78_AF7887C44E46" x="121" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_9F78_AF7887C44E46" x="284" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_9F78_AF7887C44E46" x="198" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_9F78_AF7887C44E46" x="198" y="490"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_B0AA_8C6787D5DF46" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_B0AA_8C6787D5DF46" text="+epo:signedByBuyer" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_B0AA_8C6787D5DF46" x="1064" y="238" width="83" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_B0AA_8C6787D5DF46" x="1005" y="238" width="83" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_B0AA_8C6787D5DF46" text="0..*" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_B0AA_8C6787D5DF46" x="1147" y="261" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_B0AA_8C6787D5DF46" x="1088" y="261" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_B0AA_8C6787D5DF46" x="963" y="256"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_B0AA_8C6787D5DF46" x="1166" y="256"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_B0AA_8C6787D5DF46" x="1107" y="256"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_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_CE2B_411b_8A9A_9A4173CBD283" text="+epo:bindsBuyer" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_8A9A_9A4173CBD283" x="1077" y="205" width="68" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_8A9A_9A4173CBD283" x="1018" y="205" width="68" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_8A9A_9A4173CBD283" text="0..*" modelElement="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_8A9A_9A4173CBD283" x="1147" y="230" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_8A9A_9A4173CBD283" x="1088" y="230" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_8A9A_9A4173CBD283" x="963" y="225"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_8A9A_9A4173CBD283" x="1166" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_8A9A_9A4173CBD283" x="1107" y="225"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_A885_D5B3B1D5960A" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" modelElement="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_A885_D5B3B1D5960A" text="+epo:bindsContractor" modelElement="EAID_dst8CA809_26BC_46b1_A885_D5B3B1D5960A">
@@ -888,13 +904,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_CE2B_411b_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A5D7_18A876BF10CF" x="454" y="230" width="84" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_CE2B_411b_A5D7_18A876BF10CF" x="531" y="231" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_CE2B_411b_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A5D7_18A876BF10CF" x="433" y="230" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_CE2B_411b_A5D7_18A876BF10CF" x="510" y="231" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A5D7_18A876BF10CF" x="744" y="248"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A5D7_18A876BF10CF" x="426" y="248"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_CE2B_411b_A5D7_18A876BF10CF" x="744" y="249"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_CE2B_411b_A5D7_18A876BF10CF" x="503" y="249"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_3ABE52BE_CE2B_411b_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_CE2B_411b_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -929,7 +945,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_CE2B_411b_94BC_1C90816E0487" x="557" y="409"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7" isFrame="false" modelElement="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -985,7 +1001,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_542CAED6_F3AE_44e3_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F3AE_44e3_BE33_620A29646687" text="epo:AwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3AE_44e3_BE33_620A29646687" x="1523" y="557" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F3AE_44e3_BE33_620A29646687" x="1523" y="571" width="102" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_8D4A_95B9DD217458" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_8D4A_95B9DD217458" text="+epo:providesContractTotalPaymentValue" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
@@ -997,16 +1013,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_8D4A_95B9DD217458" x="1156" y="495"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8D4A_95B9DD217458" x="1156" y="571"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_B44C_0F56A31472A7" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_B44C_0F56A31472A7" text="+epo-ord:hasPrepaidAmount" modelElement="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_B44C_0F56A31472A7" x="789" y="728" width="116" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_B44C_0F56A31472A7" text="0..1" modelElement="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_B44C_0F56A31472A7" x="925" y="749" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_B44C_0F56A31472A7" x="711" y="744"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_B44C_0F56A31472A7" x="944" y="744"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_B9AB_1FE660C3663F" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_B9AB_1FE660C3663F" text="+epo-ord:hasTotalChargeAmount" modelElement="EAID_dst8CF3B1_3FB3_43b9_B9AB_1FE660C3663F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_B9AB_1FE660C3663F" x="782" y="603" width="134" height="14"/>
@@ -1087,15 +1093,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_AACD_8319D1389BB9" x="1014" y="495"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_AACD_8319D1389BB9" x="1014" y="571"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_AF6D_C4779365607A" source="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_AF6D_C4779365607A" text="+epo-ord:concernsContract" modelElement="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_AF6D_C4779365607A" x="858" y="276" width="108" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_A6A1_F386873985BC" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_A6A1_F386873985BC" text="+epo-ord:hasAmountDueForPayment" modelElement="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_A6A1_F386873985BC" x="770" y="577" width="151" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_AF6D_C4779365607A" text="1" modelElement="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_AF6D_C4779365607A" x="960" y="299" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_A6A1_F386873985BC" text="1" modelElement="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_A6A1_F386873985BC" x="936" y="600" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_AF6D_C4779365607A" x="679" y="294"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_AF6D_C4779365607A" x="968" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_A6A1_F386873985BC" x="711" y="595"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_A6A1_F386873985BC" x="944" y="595"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_8F53_7F49CAD18053" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_8F53_7F49CAD18053" text="+epo:refersToContract" modelElement="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053">
@@ -1149,8 +1155,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_82EA_14ABA20458B6" text="0..1" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_82EA_14ABA20458B6" x="1214" y="688" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_82EA_14ABA20458B6" x="1540" y="627"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_82EA_14ABA20458B6" x="1540" y="683"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_82EA_14ABA20458B6" x="1544" y="626"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_82EA_14ABA20458B6" x="1544" y="683"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_82EA_14ABA20458B6" x="1211" y="683"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_91B2_799578663395" source="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_470D1B16_C07B_4868_91B2_799578663395">
@@ -1173,17 +1179,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_8FE0_29F2F5CFCD7E" x="591" y="777"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8FE0_29F2F5CFCD7E" x="591" y="855"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_A715_C0AF0EF80B65" x="775" y="961" width="102" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_A715_C0AF0EF80B65" x="839" y="930" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_A715_C0AF0EF80B65" x="372" y="987"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_A715_C0AF0EF80B65" x="827" y="987"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_A715_C0AF0EF80B65" x="827" y="925"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_A6DC_62DFC84C122D" x="1228" y="736" width="203" height="14"/>
@@ -1204,31 +1199,31 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_8D8A_71BD69D25161" x="1432" y="726"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8D8A_71BD69D25161" x="1211" y="726"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_910B_A28B233CEB46" x="1234" y="764" width="137" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_910B_A28B233CEB46" x="1214" y="787" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_910B_A28B233CEB46" x="1432" y="782"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_910B_A28B233CEB46" x="1211" y="782"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_8EBE_A60BD8ED070A" x="1568" y="699"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8EBE_A60BD8ED070A" x="1568" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_8EBE_A60BD8ED070A" x="1574" y="699"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8EBE_A60BD8ED070A" x="1574" y="626"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_8084_FD257C99FB89" x="1024" y="962" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_8084_FD257C99FB89" text="0..1" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_8084_FD257C99FB89" x="1099" y="930" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_8084_FD257C99FB89" x="372" y="1050"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_8084_FD257C99FB89" x="1087" y="1050"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_8084_FD257C99FB89" x="1087" y="925"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_B44C_0F56A31472A7" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C753CDC6_88B6_449b_B44C_0F56A31472A7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_B44C_0F56A31472A7" text="+epo-ord:hasPrepaidAmount" modelElement="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_B44C_0F56A31472A7" x="789" y="728" width="116" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_B44C_0F56A31472A7" text="0..1" modelElement="EAID_dst53CDC6_88B6_449b_B44C_0F56A31472A7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_B44C_0F56A31472A7" x="925" y="749" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_B44C_0F56A31472A7" x="711" y="744"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_B44C_0F56A31472A7" x="944" y="744"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_86C4_6F47177DB0C6" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C3F576CC_0DFC_40d6_86C4_6F47177DB0C6">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_86C4_6F47177DB0C6" text="+epo-ord:hasRoundingAmount" modelElement="EAID_dstF576CC_0DFC_40d6_86C4_6F47177DB0C6">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_86C4_6F47177DB0C6" x="783" y="751" width="123" height="14"/>
@@ -1239,16 +1234,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_86C4_6F47177DB0C6" x="711" y="769"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_86C4_6F47177DB0C6" x="944" y="769"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_A6A1_F386873985BC" source="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_CBE972DE_D8B8_42a5_A6A1_F386873985BC">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_A6A1_F386873985BC" text="+epo-ord:hasAmountDueForPayment" modelElement="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_A6A1_F386873985BC" x="770" y="577" width="151" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_A6A1_F386873985BC" text="1" modelElement="EAID_dstE972DE_D8B8_42a5_A6A1_F386873985BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_A6A1_F386873985BC" x="936" y="600" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_A6A1_F386873985BC" x="711" y="595"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_A6A1_F386873985BC" x="944" y="595"/>
-			</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"/>
@@ -1290,6 +1275,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_8D46_5814F76AE356" x="416" y="890"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_F3AE_44e3_8D46_5814F76AE356" x="546" y="890"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_AF6D_C4779365607A" source="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F3AE_44e3_AF6D_C4779365607A" text="+epo-ord:concernsContract" modelElement="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_AF6D_C4779365607A" x="858" y="276" width="108" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_AF6D_C4779365607A" text="1" modelElement="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_AF6D_C4779365607A" x="960" y="299" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_AF6D_C4779365607A" x="679" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_AF6D_C4779365607A" x="968" y="294"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_B489_34E46CFF8E24" text="+epo:hasFinancialOfferValue" modelElement="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_B489_34E46CFF8E24" x="1241" y="635" width="117" height="14"/>
@@ -1301,28 +1296,39 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_B489_34E46CFF8E24" x="1400" y="652"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F3AE_44e3_B489_34E46CFF8E24" x="1211" y="652"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_542CAED6_F3AE_44e3_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_F3AE_44e3_A715_C0AF0EF80B65" text="+epo-cat:hasNetQuantity" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F3AE_44e3_A715_C0AF0EF80B65" x="775" y="961" width="102" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F3AE_44e3_A715_C0AF0EF80B65" text="0..1" modelElement="EAID_dst9E2AC7_4D59_4119_A715_C0AF0EF80B65">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F3AE_44e3_A715_C0AF0EF80B65" x="839" y="930" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F3AE_44e3_A715_C0AF0EF80B65" x="372" y="987"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F3AE_44e3_A715_C0AF0EF80B65" x="827" y="987"/>
+				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_18EBC143_4E14_4922_BD6F_14875E8F79FE" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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="391" width="246" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_B200_94202420C754" x="231" y="346" width="246" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_8372_75A07B6AB066" x="853" y="398" width="219" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_8372_75A07B6AB066" x="853" y="368" width="219" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_B947_0D8F652ACB31" modelElement="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_B947_0D8F652ACB31" text="epo-con:Deliverable"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_B947_0D8F652ACB31" x="613" y="426" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_B947_0D8F652ACB31" x="613" y="382" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_8D25_BA714BA9C3EC" text="epo:Quantity"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_8D25_BA714BA9C3EC" x="555" y="573" width="205" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_8D25_BA714BA9C3EC" x="556" y="535" width="205" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_A610_DCE4C9E2C0F3" modelElement="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_4E14_4922_A610_DCE4C9E2C0F3" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_A610_DCE4C9E2C0F3" text="at-voc:measurement-unit"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_A610_DCE4C9E2C0F3" x="918" y="578" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4E14_4922_A610_DCE4C9E2C0F3" x="918" y="540" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_18EBC143_4E14_4922_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4E14_4922_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
@@ -1371,28 +1377,28 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_B62C_6F674CDB3888" x="199" y="127"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_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_4E14_4922_A8BC_8FBCF102380D" x="760" y="608"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_A8BC_8FBCF102380D" x="918" y="608"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_A8BC_8FBCF102380D" x="761" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_A8BC_8FBCF102380D" x="918" y="570"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_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_4E14_4922_8084_FD257C99FB89" text="+epo-ord:hasTaxInformation" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_8084_FD257C99FB89" x="223" y="302" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_8084_FD257C99FB89" text="0..1" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_8084_FD257C99FB89" text="0..*" modelElement="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_8084_FD257C99FB89" x="308" y="286" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8084_FD257C99FB89" x="296" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8084_FD257C99FB89" x="296" y="346"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_8084_FD257C99FB89" x="296" y="281"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_8FFB_CD1622DAF44A" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" modelElement="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4E14_4922_8FFB_CD1622DAF44A" text="+epo:specifiesDeliverable" modelElement="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_8FFB_CD1622DAF44A" x="714" y="441" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_8FFB_CD1622DAF44A" x="714" y="399" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_8FFB_CD1622DAF44A" text="0..*" modelElement="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_8FFB_CD1622DAF44A" x="706" y="462" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_8FFB_CD1622DAF44A" x="706" y="420" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8FFB_CD1622DAF44A" x="853" y="457"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_8FFB_CD1622DAF44A" x="703" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8FFB_CD1622DAF44A" x="853" y="415"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_8FFB_CD1622DAF44A" x="703" y="415"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_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_4E14_4922_9953_EA1E6D255A89" text="+epo:hasContractValue" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
@@ -1401,35 +1407,35 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_9953_EA1E6D255A89" text="0..1" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_9953_EA1E6D255A89" x="810" y="231" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_9953_EA1E6D255A89" x="974" y="398"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_9953_EA1E6D255A89" x="974" y="368"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_9953_EA1E6D255A89" x="974" y="226"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4E14_4922_9953_EA1E6D255A89" x="807" y="226"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_ADF6_2FEC3A1BB755" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" modelElement="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4E14_4922_ADF6_2FEC3A1BB755" text="+epo-ord:hasTaxInformation" modelElement="EAID_dstD708FC_CE05_4098_ADF6_2FEC3A1BB755">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_ADF6_2FEC3A1BB755" x="148" y="324" width="115" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_ADF6_2FEC3A1BB755" x="137" y="324" width="115" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_ADF6_2FEC3A1BB755" text="0..1" modelElement="EAID_dstD708FC_CE05_4098_ADF6_2FEC3A1BB755">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_ADF6_2FEC3A1BB755" x="210" y="286" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_ADF6_2FEC3A1BB755" x="199" y="286" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_ADF6_2FEC3A1BB755" x="1040" y="496"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_ADF6_2FEC3A1BB755" x="1040" y="656"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4E14_4922_ADF6_2FEC3A1BB755" x="198" y="656"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4E14_4922_ADF6_2FEC3A1BB755" x="198" y="281"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_ADF6_2FEC3A1BB755" x="1029" y="466"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_ADF6_2FEC3A1BB755" x="1029" y="611"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4E14_4922_ADF6_2FEC3A1BB755" x="187" y="611"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4E14_4922_ADF6_2FEC3A1BB755" x="187" y="281"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_88A3_D705701F1971" source="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_838E60F9_C54C_4c80_88A3_D705701F1971">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4E14_4922_88A3_D705701F1971" text="+epo-cat:hasQuantity" modelElement="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_88A3_D705701F1971" x="617" y="521" width="88" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4E14_4922_88A3_D705701F1971" x="618" y="483" width="88" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_88A3_D705701F1971" text="0..1" modelElement="EAID_dst8E60F9_C54C_4c80_88A3_D705701F1971">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_88A3_D705701F1971" x="665" y="555" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_88A3_D705701F1971" x="666" y="517" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_88A3_D705701F1971" x="657" y="496"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_88A3_D705701F1971" x="657" y="573"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_88A3_D705701F1971" x="658" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_88A3_D705701F1971" x="658" y="535"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_A7F4_63564C0ECB71" source="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" target="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" modelElement="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_A7F4_63564C0ECB71" x="613" y="457"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_A7F4_63564C0ECB71" x="477" y="457"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_A7F4_63564C0ECB71" x="613" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4E14_4922_A7F4_63564C0ECB71" x="477" y="412"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_18EBC143_4E14_4922_8E1A_EF574D760E6F" source="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4E14_4922_8E1A_EF574D760E6F" text="+epo:hasTotalValue" modelElement="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F">
@@ -1438,11 +1444,11 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4E14_4922_8E1A_EF574D760E6F" text="0..1" modelElement="EAID_dstAF3614_44A0_4944_8E1A_EF574D760E6F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4E14_4922_8E1A_EF574D760E6F" x="670" y="292" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8E1A_EF574D760E6F" x="658" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4E14_4922_8E1A_EF574D760E6F" x="658" y="382"/>
 				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_AC6531EC_BF50_48e1_BAB3_75F8F68D5092" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -1575,7 +1581,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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FBEEEA5A_5887_4162_8717_4D8A5551405C" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -1645,9 +1651,16 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5887_4162_8F05_5126320D2A7F" text="epo-con:ContractAmendment"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5887_4162_8F05_5126320D2A7F" x="714" y="465" width="211" height="40"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_BA75_DE0B948A3FD5" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" modelElement="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_BA75_DE0B948A3FD5" x="823" y="639"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_BA75_DE0B948A3FD5" x="823" y="695"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_B19D_1727246FC1BD" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5887_4162_B19D_1727246FC1BD" text="+epo:updatesContractValue" modelElement="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5887_4162_B19D_1727246FC1BD" x="1146" y="167" width="112" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5887_4162_B19D_1727246FC1BD" text="0..1" modelElement="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5887_4162_B19D_1727246FC1BD" x="1216" y="147" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_B19D_1727246FC1BD" x="925" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_B19D_1727246FC1BD" x="1204" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5887_4162_B19D_1727246FC1BD" x="1204" y="142"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_8526_5A4910F24815" source="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" target="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" modelElement="EAID_74371426_1670_46df_8526_5A4910F24815">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_8526_5A4910F24815" x="1064" y="590"/>
@@ -1697,31 +1710,14 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_ABF2_BA01D9E3FEE4" x="1106" y="590"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_ABF2_BA01D9E3FEE4" x="1106" y="657"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_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_5887_4162_8461_8385AB23B103" text="+epo:concernsContractAmendment" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5887_4162_8461_8385AB23B103" x="761" y="490" width="168" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5887_4162_8461_8385AB23B103" text="1" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5887_4162_8461_8385AB23B103" x="831" y="510" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_8461_8385AB23B103" x="819" y="569"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_8461_8385AB23B103" x="819" y="505"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_BA75_DE0B948A3FD5" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" modelElement="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_BA75_DE0B948A3FD5" x="823" y="639"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_BA75_DE0B948A3FD5" x="823" y="695"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_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_5887_4162_B308_C0F08C743DCF" x="819" y="289"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_B308_C0F08C743DCF" x="819" y="169"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_B19D_1727246FC1BD" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5887_4162_B19D_1727246FC1BD" text="+epo:hasRestatedContractValue" modelElement="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5887_4162_B19D_1727246FC1BD" x="1129" y="167" width="129" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5887_4162_B19D_1727246FC1BD" text="0..1" modelElement="EAID_dst29D2D0_C843_497f_B19D_1727246FC1BD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5887_4162_B19D_1727246FC1BD" x="1216" y="147" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_B19D_1727246FC1BD" x="925" y="478"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_B19D_1727246FC1BD" x="1204" y="478"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5887_4162_B19D_1727246FC1BD" x="1204" y="142"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_876B_BEE9D986B4DA" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5887_4162_876B_BEE9D986B4DA" text="+epo:amendsContract" modelElement="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5887_4162_876B_BEE9D986B4DA" x="716" y="416" width="89" height="14"/>
@@ -1811,8 +1807,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_8AE5_E5806C9B2562" x="710" y="338"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5887_4162_8AE5_E5806C9B2562" x="545" y="338"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FBEEEA5A_5887_4162_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_5887_4162_8461_8385AB23B103" text="+epo:concernsContractAmendment" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5887_4162_8461_8385AB23B103" x="754" y="520" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5887_4162_8461_8385AB23B103" text="1" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5887_4162_8461_8385AB23B103" x="831" y="510" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5887_4162_8461_8385AB23B103" x="819" y="569"/>
+				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_BD365BA4_FB8A_4fc3_8D9D_5445218300B9" isFrame="false" modelElement="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03">
 			<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"/>
@@ -1857,6 +1863,14 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FB8A_4fc3_8F05_5126320D2A7F" text="epo-con:ContractAmendment"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FB8A_4fc3_8F05_5126320D2A7F" x="251" y="441" width="135" height="34"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BD365BA4_FB8A_4fc3_A2A4_6665F938474C" modelElement="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FB8A_4fc3_A2A4_6665F938474C" text="epo-not:DirectAwardPrenotificationNotice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FB8A_4fc3_A2A4_6665F938474C" x="62" y="100" width="204" height="42"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BD365BA4_FB8A_4fc3_A23F_1DCF65619AE2" modelElement="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FB8A_4fc3_A23F_1DCF65619AE2" text="epo-not:ResultNotice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FB8A_4fc3_A23F_1DCF65619AE2" x="455" y="23" width="202" height="48"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BD365BA4_FB8A_4fc3_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_FB8A_4fc3_95EB_23D106ED6921" text="+epo:followsRulesSetBy" modelElement="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FB8A_4fc3_95EB_23D106ED6921" x="534" y="490" width="96" height="14"/>
@@ -1950,6 +1964,26 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FB8A_4fc3_8C14_7C6DA83E8A46" x="602" y="395"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FB8A_4fc3_8C14_7C6DA83E8A46" x="572" y="265"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BD365BA4_FB8A_4fc3_B325_4443E0BF6A2D" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FB8A_4fc3_B325_4443E0BF6A2D" text="+epo:announcesContract" modelElement="EAID_dst2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FB8A_4fc3_B325_4443E0BF6A2D" x="509" y="77" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FB8A_4fc3_B325_4443E0BF6A2D" text="0..*" modelElement="EAID_dst2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FB8A_4fc3_B325_4443E0BF6A2D" x="564" y="98" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FB8A_4fc3_B325_4443E0BF6A2D" x="556" y="71"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FB8A_4fc3_B325_4443E0BF6A2D" x="556" y="116"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BD365BA4_FB8A_4fc3_82B0_7ED4BAC17D43" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FB8A_4fc3_82B0_7ED4BAC17D43" text="+epo:announcesContract" modelElement="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FB8A_4fc3_82B0_7ED4BAC17D43" x="305" y="111" width="100" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FB8A_4fc3_82B0_7ED4BAC17D43" text="0..*" modelElement="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FB8A_4fc3_82B0_7ED4BAC17D43" x="388" y="134" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FB8A_4fc3_82B0_7ED4BAC17D43" x="266" y="129"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FB8A_4fc3_82B0_7ED4BAC17D43" x="407" y="129"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BD365BA4_FB8A_4fc3_801D_DFF3EA946B55" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FB8A_4fc3_801D_DFF3EA946B55" x="318" y="441"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FB8A_4fc3_801D_DFF3EA946B55" x="466" y="265"/>
@@ -1966,6 +2000,36 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FB8A_4fc3_876B_BEE9D986B4DA" x="482" y="265"/>
 			</ownedElement>
 		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_67845F73_B29D_4ee6_BD89_820DD70FF597" isFrame="false" modelElement="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18">
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_AA4D_221EF3851EAA" modelElement="EAID_E4601C78_01E7_4919_AA4D_221EF3851EAA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_AA4D_221EF3851EAA" text="xsd:boolean"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_AA4D_221EF3851EAA" x="54" y="334" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_A559_DABF00944929" modelElement="EAID_23AD5812_9624_4cbc_A559_DABF00944929">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_A559_DABF00944929" text="xsd:anyURI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_A559_DABF00944929" x="162" y="42" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_8761_15FFA2CD7E45" modelElement="EAID_EA826A3E_6246_47cf_8761_15FFA2CD7E45">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_8761_15FFA2CD7E45" text="xsd:date"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_8761_15FFA2CD7E45" x="54" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_94D4_876797E1E87C" modelElement="EAID_A13336A0_37D5_43cd_94D4_876797E1E87C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_94D4_876797E1E87C" text="xsd:dateTime"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_94D4_876797E1E87C" x="162" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_BE6A_EFA5D96ED74A" modelElement="EAID_14241140_2F4C_4084_BE6A_EFA5D96ED74A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_BE6A_EFA5D96ED74A" text="xsd:integer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_BE6A_EFA5D96ED74A" x="162" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_B950_E21372EF9B21" modelElement="EAID_E00B355C_D5C5_47f3_B950_E21372EF9B21">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_B950_E21372EF9B21" text="xsd:decimal"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_B950_E21372EF9B21" x="54" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_67845F73_B29D_4ee6_AFCB_66A3B11BB38F" modelElement="EAID_6AC6185D_A375_4613_AFCB_66A3B11BB38F">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B29D_4ee6_AFCB_66A3B11BB38F" text="rdf:PlainLiteral"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B29D_4ee6_AFCB_66A3B11BB38F" x="54" y="41" width="90" height="38"/>
+			</ownedElement>
+		</umldi:Diagram>
 	</uml:Model>
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
@@ -1989,53 +2053,31 @@
 				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="1" ea_localid="218" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:27:52" modified="2023-07-17 18:27: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="contract"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2023-07-17 18:27:52" modified="2023-07-17 18:27:52"/>
-				<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_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" 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;"/>
-				<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_2729D2D0_C843_497f_B19D_1727246FC1BD;"/>
-			</element>
-			<element xmi:idref="EAPK_7D231541_CF98_401a_A2AD_524FE8266EF5" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_7D231541_CF98_401a_A2AD_524FE8266EF5" package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="2" ea_localid="219" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:28:05" modified="2023-07-17 18:28:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" xmi:type="uml:Class" name="epo-con:Deliverable" scope="public">
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" 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="2023-07-04 15:16: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="contract"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2023-07-17 18:28:05" modified="2023-07-17 18:28:05"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<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_838E60F9_C54C_4c80_88A3_D705701F1971" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Generalization xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<Association xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
+				</links>
 			</element>
 			<element xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" xmi:type="uml:Class" name="epo-con:ContractAmendment" scope="public">
-				<model package="EAPK_7D231541_CF98_401a_A2AD_524FE8266EF5" tpos="0" ea_localid="3087" ea_eleType="element"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" 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="2023-07-17 18:28:11" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-05 16:35:49" modified="2023-07-05 16:56: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="classes"/>
+				<extendedProperties tagged="0" package_name="contract"/>
 				<links>
 					<Association xmi:id="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Generalization xmi:id="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" start="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
@@ -2045,14 +2087,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" xmi:type="uml:Class" name="epo-con:ContractModificationInformation" scope="public">
-				<model package="EAPK_7D231541_CF98_401a_A2AD_524FE8266EF5" tpos="0" ea_localid="3086" ea_eleType="element"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" 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="2023-07-17 18:28:11" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-04 15:07:45" modified="2023-07-05 16:56: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="classes"/>
+				<extendedProperties tagged="0" package_name="contract"/>
 				<attributes>
 					<attribute xmi:idref="EAID_6270C670_D8E8_4ed1_A970_FD5A00279762" name="epo:hasModificationDescription" scope="Public">
 						<initial/>
@@ -2092,96 +2134,140 @@
 					<Dependency xmi:id="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" start="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" end="EAID_C39641DF_A778_418a_94EE_8405EFE534AF"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" xmi:type="uml:Class" name="epo-con:Deliverable" scope="public">
-				<model package="EAPK_7D231541_CF98_401a_A2AD_524FE8266EF5" 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="2023-07-17 18:28:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_FE63C543_57D9_47e9_8ACC_7BD5B211C594" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" 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;"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="contract" relatedlinks="idref1=EAID_2729D2D0_C843_497f_B19D_1727246FC1BD;"/>
+			</element>
+			<element xmi:idref="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" package="EAPK_DEA61189_FE20_4c3e_86D3_781A9FE24B0A" tpos="3" ea_localid="212" 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="classes"/>
-				<links>
-					<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_838E60F9_C54C_4c80_88A3_D705701F1971" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Generalization xmi:id="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" start="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" end="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-					<Association xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
-				</links>
+				<extendedProperties tagged="0" package_name="Contract"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-		</elements>
-		<connectors>
-			<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/>
-					<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:hasRestatedContractValue" 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="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:hasRestatedContractValue"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
+			<element xmi:idref="EAID_6AC6185D_A375_4613_AFCB_66A3B11BB38F" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3165" 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:42: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_23AD5812_9624_4cbc_A559_DABF00944929" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3160" 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/>
-			</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"/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_E4601C78_01E7_4919_AA4D_221EF3851EAA" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3159" 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_EA826A3E_6246_47cf_8761_15FFA2CD7E45" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3161" 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_A13336A0_37D5_43cd_94D4_876797E1E87C" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3162" 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_E00B355C_D5C5_47f3_B950_E21372EF9B21" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3164" 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_14241140_2F4C_4084_BE6A_EFA5D96ED74A" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" tpos="0" ea_localid="3163" 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_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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<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="4573"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4463"/>
+				<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_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-				<source xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
-					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
+			<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/>
@@ -2191,10 +2277,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:amendsContract" 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: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;"/>
@@ -2202,56 +2288,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4721"/>
+				<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="1" rt="+epo:amendsContract"/>
+				<labels rb="0..1" rt="+epo-cat:hasQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
-				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
-					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+			<connector xmi:idref="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71">
+				<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=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
-					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
-					<role name="epo:concernsContractAmendment" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target 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"/>
-					<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="4742"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4474"/>
+				<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:concernsContractAmendment"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<connector xmi:idref="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -2261,10 +2346,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
-					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
-					<role name="epo:announcesContractAmendment" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
+					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+					<role name="epo:specifiesDeliverable" 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;"/>
@@ -2272,21 +2357,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4741"/>
+				<model ea_localid="4452"/>
 				<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:announcesContractAmendment"/>
+				<labels rb="0..*" rt="+epo:specifiesDeliverable"/>
 				<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_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/>
@@ -2296,9 +2381,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_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"/>
@@ -2307,21 +2392,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4740"/>
+				<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:relatesToEFormSectionIdentifier"/>
+				<labels rb="0..1" rt="+epo:updatesContractValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD">
-				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
-					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -2331,8 +2416,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -2342,7 +2427,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4772"/>
+				<model ea_localid="4573"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -2353,7 +2438,42 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
+			<connector xmi:idref="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+				<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/>
+					<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:amendsContract" 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="4721"/>
+				<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:amendsContract"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_005EFF4E_D969_4688_8461_8385AB23B103">
 				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
 					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -2365,9 +2485,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C39641DF_A778_418a_94EE_8405EFE534AF">
-					<model ea_localid="980" type="Enumeration" name="at-voc:modification-justification"/>
-					<role name="epo:hasModificationJustification" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
+					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
+					<role name="epo:concernsContractAmendment" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -2376,19 +2496,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4684"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation of why a contract was modified.&#xA;&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:modification-justification which is available at http://publications.europa.eu/resource/dataset/modification-justification&#xA;&#xA;Additional Information&#xA;&#xA;This corresponds in Standard forms to Field VII.2.2.1 and VII.2.2.3 in F20 .&#xA;&#xA;This corresponds in eForms to BT-200.&#xA;&#xA;&#xA;"/>
+				<model ea_localid="4742"/>
+				<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:hasModificationJustification"/>
+				<labels rb="1" rt="+epo:concernsContractAmendment"/>
 				<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_F4410E27_20ED_475c_B079_4FE5372221E4">
+				<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/>
@@ -2398,10 +2520,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_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
+					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
+					<role name="epo:announcesContractAmendment" 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;"/>
@@ -2409,21 +2531,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4463"/>
+				<model ea_localid="4741"/>
 				<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:hasTotalValue"/>
+				<labels rb="1" rt="+epo:announcesContractAmendment"/>
 				<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_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/>
@@ -2433,9 +2555,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-cat:hasQuantity" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -2444,21 +2566,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4454"/>
+				<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-cat:hasQuantity"/>
+				<labels rb="0..1" rt="+epo:relatesToEFormSectionIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71">
-				<source xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+			<connector xmi:idref="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD">
+				<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/>
@@ -2468,8 +2590,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+				<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/>
@@ -2479,7 +2601,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4474"/>
+				<model ea_localid="4772"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -2490,9 +2612,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<connector xmi:idref="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
+				<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/>
@@ -2502,10 +2624,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
-					<role name="epo:specifiesDeliverable" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C39641DF_A778_418a_94EE_8405EFE534AF">
+					<model ea_localid="980" type="Enumeration" name="at-voc:modification-justification"/>
+					<role name="epo:hasModificationJustification" 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;"/>
@@ -2513,13 +2635,11 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4452"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="4684"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Explanation of why a contract was modified.&#xA;&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:modification-justification which is available at http://publications.europa.eu/resource/dataset/modification-justification&#xA;&#xA;Additional Information&#xA;&#xA;This corresponds in Standard forms to Field VII.2.2.1 and VII.2.2.3 in F20 .&#xA;&#xA;This corresponds in eForms to BT-200.&#xA;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesDeliverable"/>
+				<labels rb="1" rt="+epo:hasModificationJustification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -2536,7 +2656,7 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="331" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="8"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="331" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="8"/>
 				<properties name="contract modification eForm" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-04-28 21:56:35" modified="2023-07-17 17:55: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=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;"/>
@@ -2564,7 +2684,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_790B14E6_1661_4ff0_BC3F_6B02144147E0">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="426" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="1"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="426" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="1"/>
 				<properties name="contract" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-21 10:52:42" modified="2023-06-27 11:40: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;"/>
@@ -2597,6 +2717,7 @@
 					<element geometry="Left=182;Top=268;Right=389;Bottom=356;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="22" style="DUID=32DABEA3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=755;Top=455;Right=974;Bottom=553;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=FA2E2967;"/>
 					<element geometry="EDGE=3;SX=-17;SY=-4;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=50: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_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=4CD5680A;SOID=FA2E2967;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="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_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" style="Mode=3;EOID=E5F6093F;SOID=F8987D6A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=8;SY=15;EX=8;EY=15;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_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=32DABEA3;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$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_6F3635F3_387D_467a_95E2_ACDA293AE181" style="Mode=3;EOID=32DABEA3;SOID=85363CCC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=33:OY=25: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_95FB9493_C207_456a_A0EF_B68899832EE8" style="Mode=3;EOID=32DABEA3;SOID=85363CCC;Color=-1;LWidth=0;Hidden=0;"/>
@@ -2604,7 +2725,7 @@
 					<element geometry="EDGE=1;SX=87;SY=0;EX=0;EY=-45;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=951:-357$;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=76BB0061;SOID=FA2E2967;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-78;SY=0;EX=0;EY=-22;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83: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=786:-639$;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=B76F489B;SOID=FA2E2967;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=17;EX=3;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153: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=;" subject="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" style="Mode=3;EOID=ACBECE0C;SOID=FA2E2967;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="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_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" style="Mode=3;EOID=E5F6093F;SOID=F8987D6A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1240;SCTR.TOP=-235;SCTR.RIGHT=1283;SCTR.BOTTOM=-205;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=76:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1283:-231$1283:-205$1240:-205$1240:-231$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=76BB0061;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-85;SY=0;EX=0;EY=19;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=779:-374$;" subject="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" style="Mode=3;EOID=B9480A5B;SOID=FA2E2967;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=1121;SCTR.TOP=-243;SCTR.RIGHT=1158;SCTR.BOTTOM=-225;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=41:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1158:-231$1158:-225$1121:-225$1121:-243$1143:-243$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=76BB0061;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=12;EY=0;SX=0;SY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=58: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=1224:-503$;" subject="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E" style="Mode=3;EOID=2C69F092;SOID=FA2E2967;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -2627,20 +2748,20 @@
 					<element geometry="EDGE=3;EX=0;EY=-33;SX=-61;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=27:OX=14: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=1118:-1082$;" subject="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=FAD1A4F9;SOID=C330B92D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=-21;EX=-1;EY=-21;EDGE=4;$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=32DABEA3;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-38;SY=-14;EX=-38;EY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=12: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_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=4CD5680A;SOID=C330B92D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1240;SCTR.TOP=-235;SCTR.RIGHT=1283;SCTR.BOTTOM=-205;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=76:OY=-24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1283:-231$1283:-205$1240:-205$1240:-231$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=76BB0061;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E006DB35_535D_4444_B447_89D7A813874C" style="Mode=3;EOID=4B1AC9FB;SOID=8CF25DB1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-41;SY=4;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=0CEA947E;SOID=4CD5680A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=3;EY=0;SX=0;SY=-24;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=78: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=603:-772$;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=4B1AC9FB;SOID=4CD5680A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=85363CCC;SOID=0CEA947E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-85;SY=-5;EX=-117;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=301:-1043$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=FAD1A4F9;SOID=61CF1993;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=54: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_2FC633C9_64DB_4b46_9190_197D4A4F4C63" style="Mode=3;EOID=177FD98A;SOID=0CEA947E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-102;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=183:-1106$1752:-1106$1752:-479$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=ACBECE0C;SOID=0CEA947E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="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=;" subject="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" style="Mode=3;EOID=E05F719E;SOID=0CEA947E;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1326;SCTR.TOP=-282;SCTR.RIGHT=1359;SCTR.BOTTOM=-267;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=123:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1327:-282$1359:-282$1359:-267$1327:-267$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=76BB0061;SOID=76BB0061;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E006DB35_535D_4444_B447_89D7A813874C" style="Mode=3;EOID=4B1AC9FB;SOID=8CF25DB1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=2;SX=-86;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=27:OX=4: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=1093:-1047$;" subject="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=FAD1A4F9;SOID=C330B92D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2C0665CA_A78A_491e_88BC_180C3572A077">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="427" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="1"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="427" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="1"/>
 				<properties name="contract hierarchy" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-21 14:26:15" modified="2023-07-14 14:38: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;"/>
@@ -2665,32 +2786,32 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_3ABE52BE_CE2B_411b_8587_0CE199619F12">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="428" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="3"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="428" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="3"/>
 				<properties name="contract and lot" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-03-21 16:53:03" modified="2023-06-01 17:04:53"/>
+				<project author="andreea" version="1.0" created="2023-03-21 16:53:03" modified="2023-09-11 18:26: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;"/>
-				<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=5528FE20;"/>
+				<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=556167CA;"/>
 				<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=82;Top=490;Right=172;Bottom=560;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="1" style="DUID=4A48E6E8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=251;Top=660;Right=341;Bottom=730;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" seqno="2" style="DUID=95616366;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1166;Top=211;Right=1385;Bottom=296;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" 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=3D2D85E4;"/>
+					<element geometry="Left=159;Top=490;Right=249;Bottom=560;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="1" style="DUID=4A48E6E8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=328;Top=660;Right=418;Bottom=730;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" seqno="2" style="DUID=95616366;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1107;Top=211;Right=1326;Bottom=296;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" 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=3D2D85E4;"/>
 					<element geometry="Left=809;Top=62;Right=899;Bottom=132;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" 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=C9379EA2;"/>
-					<element geometry="Left=1139;Top=475;Right=1412;Bottom=545;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="5" style="DUID=4EF603CA;NSL=0;BCol=-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=545;Right=385;Bottom=604;" 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=E7D65FFF;"/>
-					<element geometry="Left=207;Top=210;Right=426;Bottom=295;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=FF4ED015;"/>
+					<element geometry="Left=1080;Top=475;Right=1353;Bottom=545;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" seqno="5" style="DUID=4EF603CA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=284;Top=545;Right=462;Bottom=604;" 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=E7D65FFF;"/>
+					<element geometry="Left=284;Top=210;Right=503;Bottom=295;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=FF4ED015;"/>
 					<element geometry="Left=509;Top=339;Right=608;Bottom=409;" 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=8D30B367;"/>
 					<element geometry="Left=744;Top=203;Right=963;Bottom=301;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=FDF0A34C;"/>
 					<element geometry="Left=717;Top=442;Right=990;Bottom=578;" 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=AAEA3985;"/>
-					<element geometry="SX=0;SY=21;EX=-6;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=70: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=121:-674$;" subject="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" style="Mode=3;EOID=4A48E6E8;SOID=95616366;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=21;EX=-6;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=70: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=198:-674$;" subject="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" style="Mode=3;EOID=4A48E6E8;SOID=95616366;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103: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=;" subject="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649" style="Mode=3;EOID=4EF603CA;SOID=3D2D85E4;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-11;SX=0;SY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-1: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=59:-99$59:-706$;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=95616366;SOID=C9379EA2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-11;SX=0;SY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-1: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=147:-99$147:-706$;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=95616366;SOID=C9379EA2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-57;SY=-2;EX=-5;EY=-25;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=50:OY=31: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=FF4ED015;SOID=E7D65FFF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=89: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_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" style="Mode=3;EOID=95616366;SOID=E7D65FFF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=4;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=-26: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=320:-373$;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=8D30B367;SOID=FF4ED015;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=-6;EY=0;SX=0;SY=-7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=46: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=121:-259$;" subject="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" style="Mode=3;EOID=4A48E6E8;SOID=FF4ED015;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=4;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=-7: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=397:-373$;" subject="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=8D30B367;SOID=FF4ED015;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=-6;EY=0;SX=0;SY=-7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78:CY=14:OX=46: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=198:-259$;" subject="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" style="Mode=3;EOID=4A48E6E8;SOID=FF4ED015;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=-4;EX=4;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83: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_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=3D2D85E4;SOID=FDF0A34C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=11;SY=27;EX=11;EY=27;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=68: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_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=3D2D85E4;SOID=FDF0A34C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-28;SY=22;EX=-28;EY=22;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86:CY=14:OX=52: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=;" subject="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" style="Mode=3;EOID=C9379EA2;SOID=FDF0A34C;Color=-1;LWidth=0;Hidden=0;"/>
@@ -2701,16 +2822,16 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_542CAED6_F3AE_44e3_9F8A_CD66B8D4E2A7">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="437" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="6"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="437" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" 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-06-27 11:37:11"/>
+				<project author="andreea" version="1.0" created="2023-04-04 11:37:25" modified="2023-09-11 18:29: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=DC47EF82;"/>
+				<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;"/>
 				<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=1523;Top=557;Right=1613;Bottom=627;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="1" style="DUID=967C9991;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1523;Top=571;Right=1625;Bottom=626;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="1" style="DUID=967C9991;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1066;Top=855;Right=1261;Bottom=925;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="2" style="DUID=D96DEF24;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1377;Top=260;Right=1596;Bottom=330;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="3" style="DUID=3DF3D79B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<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;"/>
@@ -2725,7 +2846,6 @@
 					<element geometry="Left=944;Top=571;Right=1211;Bottom=796;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" 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=DA0B5F10;"/>
 					<element geometry="Left=968;Top=238;Right=1187;Bottom=351;" 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=630CE91A;"/>
 					<element geometry="EDGE=3;EX=46;EY=-3;SX=80;SY=-34;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=27:OX=118: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_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=DA0B5F10;SOID=25E73660;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<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="EDGE=2;SX=-20;SY=64;EX=-20;EY=64;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134: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=;" subject="EAID_F78CF3B1_3FB3_43b9_B9AB_1FE660C3663F" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=3;SY=-35;EX=3;EY=-35;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=14:OX=-28:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A110770D_19E8_400c_A438_44EEAB172389" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=-13;SY=39;EX=-13;EY=39;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=-21: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_29D3C49F_AF44_49ad_8519_B199CADD080B" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
@@ -2734,43 +2854,42 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=154:CY=14:OX=75: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_36E7ABA9_FFB1_4212_81E5_12821EB05CDD" style="Mode=3;EOID=11E5D1AB;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-67;SY=1;EX=54;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=40: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=DA0B5F10;SOID=D96DEF24;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=-63;EY=13;SX=-63;SY=13;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=27:OX=116: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_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=DA0B5F10;SOID=25E73660;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$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=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_A79DC2F8_C373_4894_AF6D_C4779365607A" style="Mode=3;EOID=630CE91A;SOID=11E5D1AB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=9;SY=88;EX=9;EY=88;$LLB=;LLT=;LMT=;LMB=;LRT=CX=151:CY=14:OX=-21: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_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-15;SY=-3;EX=29;EY=-49;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=53: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_25DE37BE_E478_4159_8F53_7F49CAD18053" style="Mode=3;EOID=630CE91A;SOID=25E73660;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=44;EX=47;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=60: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=114:-250$114:-1076$1210:-1076$;" subject="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" style="Mode=3;EOID=D96DEF24;SOID=630CE91A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=6;EX=0;EY=0;EDGE=2;$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=3DF3D79B;SOID=630CE91A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-19;EX=0;EY=58;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94: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=1335:-313$1335:-625$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=DA0B5F10;SOID=630CE91A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-28;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=26: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=1540:-683$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=DA0B5F10;SOID=967C9991;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-30;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=26: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=1544:-683$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=DA0B5F10;SOID=967C9991;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=17;SY=23;EX=17;EY=23;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=DA0B5F10;SOID=967C9991;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=19;SY=-1;EX=19;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=56: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_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=DA0B5F10;SOID=D96DEF24;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=71: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_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" style="Mode=3;EOID=6E4BDEE6;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=21;EX=-50;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=57: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=827:-987$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=E1A9DB97;SOID=70217196;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=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_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=70217196;SOID=70217196;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=-11;SY=-48;EX=-9;EY=-58;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=14: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_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=DA0B5F10;SOID=D273674B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=2;SY=-21;EX=6;EY=-29;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193: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_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=DA0B5F10;SOID=D273674B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=DA0B5F10;SOID=D273674B;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=4;SX=12;SY=-21;EX=12;EY=-104;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=20:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" style="Mode=3;EOID=DA0B5F10;SOID=D273674B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=1;EY=-19;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=967C9991;SOID=D273674B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-42;EX=-76;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=59: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=1087:-1050$;" subject="EAID_3570E246_3BA3_4795_8084_FD257C99FB89" style="Mode=3;EOID=D96DEF24;SOID=70217196;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=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_AF2B738F_531D_4495_9397_CE5771200854" 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="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_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=70217196;SOID=70217196;Color=-1;LWidth=0;Hidden=1;"/>
 					<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_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=70217196;SOID=70217196;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EDGE=2;SX=9;SY=88;EX=9;EY=88;$LLB=;LLT=;LMT=;LMB=;LRT=CX=151:CY=14:OX=-21: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_CBE972DE_D8B8_42a5_A6A1_F386873985BC" style="Mode=3;EOID=DA0B5F10;SOID=AF7598AB;Color=-1;LWidth=0;Hidden=0;"/>
+					<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="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_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" 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;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;"/>
 					<element geometry="SX=0;SY=1;EX=0;EY=0;EDGE=4;$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=416:-294$416:-890$;" subject="EAID_16C34048_F5E0_4885_8D46_5814F76AE356" style="Mode=3;EOID=6E4BDEE6;SOID=11E5D1AB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$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=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_A79DC2F8_C373_4894_AF6D_C4779365607A" style="Mode=3;EOID=630CE91A;SOID=11E5D1AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-86;SY=0;EX=0;EY=31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1400:-652$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=DA0B5F10;SOID=3DF3D79B;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=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_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=70217196;SOID=70217196;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=21;EX=-50;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=57: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=827:-987$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=E1A9DB97;SOID=70217196;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_18EBC143_4E14_4922_BD6F_14875E8F79FE">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="441" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="4"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="441" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="4"/>
 				<properties name="contract deliverable" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-11 16:26:14" modified="2023-06-22 14:25:12"/>
+				<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;"/>
-				<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=EDB902B3;"/>
+				<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=6060FCEB;"/>
 				<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/>
@@ -2779,33 +2898,33 @@
 					<element geometry="Left=272;Top=67;Right=362;Bottom=127;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="2" style="DUID=306987B8;NSL=0;BCol=-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=199;Right=362;Bottom=281;" subject="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" seqno="3" style="NSL=0;DUID=F680FF3B;"/>
 					<element geometry="Left=540;Top=193;Right=807;Bottom=287;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" 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=81173519;"/>
-					<element geometry="Left=918;Top=578;Right=1008;Bottom=638;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" 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=793FDC89;"/>
-					<element geometry="Left=555;Top=573;Right=760;Bottom=643;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" 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=4D500554;"/>
-					<element geometry="Left=613;Top=426;Right=703;Bottom=496;" subject="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" seqno="7" style="DUID=705879C0;"/>
-					<element geometry="Left=853;Top=398;Right=1072;Bottom=496;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=3B0C7E8F;"/>
-					<element geometry="Left=231;Top=391;Right=477;Bottom=531;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" 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=8BA3EBC9;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-416;SCTR.RIGHT=507;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-416$507:-416$507:-401$477:-401$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="Left=918;Top=540;Right=1008;Bottom=600;" subject="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" 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=793FDC89;"/>
+					<element geometry="Left=556;Top=535;Right=761;Bottom=605;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" 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=4D500554;"/>
+					<element geometry="Left=613;Top=382;Right=703;Bottom=452;" subject="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31" seqno="7" style="DUID=705879C0;"/>
+					<element geometry="Left=853;Top=368;Right=1072;Bottom=466;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=3B0C7E8F;"/>
+					<element geometry="Left=231;Top=346;Right=477;Bottom=486;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" 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=8BA3EBC9;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-371;SCTR.RIGHT=507;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-371$507:-371$507:-356$477:-356$;" subject="EAID_AF2B738F_531D_4495_9397_CE5771200854" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=14;SY=0;EX=14;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=53: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_4D92CD55_08CD_4d21_806C_38F93CA90719" style="Mode=3;EOID=306987B8;SOID=F680FF3B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=56;SY=32;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=14:OX=-3: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_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=81173519;SOID=F680FF3B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-44;SY=-21;EX=-44;EY=-21;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=-16: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_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=81173519;SOID=F680FF3B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-416;SCTR.RIGHT=507;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-416$507:-416$507:-401$477:-401$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-416;SCTR.RIGHT=507;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-416$507:-416$507:-401$477:-401$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=123;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-604$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=4D500554;SOID=8BA3EBC9;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=476;SCTR.TOP=-371;SCTR.RIGHT=507;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-371$507:-371$507:-356$477:-356$;" subject="EAID_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-371;SCTR.RIGHT=507;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-371$507:-371$507:-356$477:-356$;" subject="EAID_0E6B1F71_0D37_48b2_B8F5_8C2924DBDB24" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=123;SY=0;EX=0;EY=4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-566$;" subject="EAID_329E2AC7_4D59_4119_A715_C0AF0EF80B65" style="Mode=3;EOID=4D500554;SOID=8BA3EBC9;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=-14;SY=-2;EX=-14;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=49: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_0D4101FD_7720_417c_B62C_6F674CDB3888" style="Mode=3;EOID=EE17D81D;SOID=F680FF3B;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=476;SCTR.TOP=-416;SCTR.RIGHT=507;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-416$507:-416$507:-401$477:-401$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-371;SCTR.RIGHT=507;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-371$507:-371$507:-356$477:-356$;" subject="EAID_B48B62CF_836E_494c_A0AF_73F7FB5C8991" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=2;$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=793FDC89;SOID=4D500554;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=49: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_3570E246_3BA3_4795_8084_FD257C99FB89" style="Mode=2;EOID=F680FF3B;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-49;EX=0;EY=10;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103: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=;" subject="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A" style="Mode=3;EOID=705879C0;SOID=3B0C7E8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=12;SY=0;EX=0;EY=14;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94: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=974:-226$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=81173519;SOID=3B0C7E8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=78;SY=0;EX=-61;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=72: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=1040:-656$198:-656$;" subject="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" style="Mode=3;EOID=F680FF3B;SOID=3B0C7E8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=67;SY=0;EX=-72;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=72: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=1029:-611$187:-611$;" subject="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" style="Mode=3;EOID=F680FF3B;SOID=3B0C7E8F;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=88:CY=14:OX=55: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_838E60F9_C54C_4c80_88A3_D705701F1971" style="Mode=3;EOID=4D500554;SOID=705879C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=4;EX=2;EY=4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_849636C8_7FA6_4950_A7F4_63564C0ECB71" style="Mode=3;EOID=8BA3EBC9;SOID=705879C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81: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=;" subject="EAID_7AAF3614_44A0_4944_8E1A_EF574D760E6F" style="Mode=2;EOID=81173519;SOID=705879C0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-416;SCTR.RIGHT=507;SCTR.BOTTOM=-401;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-416$507:-416$507:-401$477:-401$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=476;SCTR.TOP=-371;SCTR.RIGHT=507;SCTR.BOTTOM=-356;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=477:-371$507:-371$507:-356$477:-356$;" subject="EAID_574DB5D8_4929_4670_9014_608B3C5534ED" style="Mode=3;EOID=8BA3EBC9;SOID=8BA3EBC9;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_AC6531EC_BF50_48e1_BAB3_75F8F68D5092">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="442" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="2"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="442" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="2"/>
 				<properties name="contract roles" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-04-11 17:04:01" modified="2023-06-22 14:22: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;"/>
@@ -2834,11 +2953,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FBEEEA5A_5887_4162_8717_4D8A5551405C">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="460" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="7"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="460" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="7"/>
 				<properties name="contract modification std form" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-05-11 16:40:42" modified="2023-07-17 17:43:54"/>
+				<project author="andreea" version="1.0" created="2023-05-11 16:40:42" modified="2023-08-16 19: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=6E6D0B0E;"/>
+				<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=FC03A02B;"/>
 				<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/>
@@ -2860,7 +2979,7 @@
 					<element geometry="Left=775;Top=695;Right=865;Bottom=755;" subject="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" 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=4221F4B6;"/>
 					<element geometry="Left=1046;Top=316;Right=1173;Bottom=360;" 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=1A01CFC7;"/>
 					<element geometry="Left=710;Top=289;Right=929;Bottom=387;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=2F9CEA93;"/>
-					<element geometry="SX=22;SY=-4;EX=-4;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=75:OY=-20: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_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" style="Mode=3;EOID=4221F4B6;SOID=2683D601;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=7;EX=117;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112:CY=14:OX=61: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=1204:-478$;" subject="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD" style="Mode=3;EOID=D078ECA6;SOID=E130E9F5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=44;SY=6;EX=-35;EY=30;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=50:OY=-44: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_74371426_1670_46df_8526_5A4910F24815" style="Mode=3;EOID=BF449A5B;SOID=B0D6223E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB" style="Mode=3;EOID=7617282D;SOID=021878E9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=78;EX=-15;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=66: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=146:-458$;" subject="EAID_FAA22183_A73E_42a1_854B_9995087470E4" style="Mode=3;EOID=0D6184C6;SOID=021878E9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -2870,11 +2989,9 @@
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=697;SCTR.TOP=-44;SCTR.RIGHT=728;SCTR.BOTTOM=-29;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=728:-29$728:-29$697:-29$697:-44$727:-44$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=8A69C25E;SOID=8A69C25E;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=817;SCTR.TOP=-30;SCTR.RIGHT=832;SCTR.BOTTOM=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=832:-29$832:1$817:1$817:-29$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=8A69C25E;SOID=8A69C25E;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=41;SY=0;EX=41;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" style="Mode=3;EOID=27DA490A;SOID=C54202A9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-5;SY=17;EX=-5;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=D078ECA6;SOID=C54202A9;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EX=0;EY=5;SX=35;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=82:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=27:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" style="Mode=3;EOID=BF449A5B;SOID=B0D6223E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=168:CY=14:OX=91: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_005EFF4E_D969_4688_8461_8385AB23B103" style="Mode=3;EOID=2683D601;SOID=E130E9F5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=22;SY=-4;EX=-4;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=75:OY=-20: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_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5" style="Mode=3;EOID=4221F4B6;SOID=2683D601;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=8A69C25E;SOID=2F9CEA93;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=7;EX=117;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=61: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=1204:-478$;" subject="EAID_2729D2D0_C843_497f_B19D_1727246FC1BD" style="Mode=3;EOID=D078ECA6;SOID=E130E9F5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-41;SY=3;EX=-40;EY=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=34: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_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" style="Mode=3;EOID=2F9CEA93;SOID=E130E9F5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=38;SY=-17;EX=39;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" style="Mode=3;EOID=2F9CEA93;SOID=E130E9F5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-40;SY=0;EX=0;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=8:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=779:-189$;" subject="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53" style="Mode=3;EOID=FD9C4BDD;SOID=2F9CEA93;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -2884,30 +3001,32 @@
 					<element geometry="SX=-2;SY=-3;EX=-2;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-8: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=;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=1A01CFC7;SOID=2F9CEA93;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-74;SY=0;EX=0;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=86: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=745:-222$;" subject="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" style="Mode=3;EOID=FD9C4BDD;SOID=2F9CEA93;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=5: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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" style="Mode=3;EOID=27DA490A;SOID=2F9CEA93;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-26;EX=0;EY=-25;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=D078ECA6;SOID=C54202A9;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=84:OY=10: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_005EFF4E_D969_4688_8461_8385AB23B103" style="Mode=3;EOID=E130E9F5;SOID=2683D601;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_BD365BA4_FB8A_4fc3_8D9D_5445218300B9">
-				<model package="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" localID="461" owner="EAPK_ECF52C28_EF1B_4b77_B89F_F6BBDD30674C" tpos="5"/>
+				<model package="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" localID="461" owner="EAPK_089F9B57_E3AC_4427_A8CD_54458E70DB03" tpos="5"/>
 				<properties name="contract documents" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-05-22 12:13:10" modified="2023-07-14 14:40:07"/>
+				<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;"/>
-				<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=A5E37C2A;"/>
+				<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=944B37BD;"/>
 				<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=251;Top=441;Right=386;Bottom=475;" subject="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" seqno="1" style="DUID=2764BA6B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=561;Top=395;Right=651;Bottom=430;" subject="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" seqno="2" style="DUID=F9ABFFFB;NSL=0;BCol=-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=449;Right=785;Bottom=502;" subject="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" seqno="3" style="DUID=21F5AD11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=471;Top=523;Right=599;Bottom=558;" subject="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" seqno="4" style="DUID=9D32EFCA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=739;Top=384;Right=863;Bottom=419;" subject="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" seqno="5" style="DUID=0FF73199;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=55;Top=156;Right=274;Bottom=226;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="6" style="DUID=8B156C14;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=933;Top=123;Right=1065;Bottom=193;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="7" style="DUID=AEA57ED3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=926;Top=298;Right=1070;Bottom=368;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="8" style="DUID=75CA37D0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=877;Top=410;Right=1120;Bottom=480;" subject="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" seqno="9" style="DUID=F37FE1F2;NSL=0;BCol=-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=299;Right=304;Bottom=369;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" seqno="10" style="DUID=E63636B8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=407;Top=116;Right=705;Bottom=265;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="11" style="DUID=05165D99;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=455;Top=23;Right=657;Bottom=71;" subject="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" seqno="1" style="DUID=35BBD5F7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=62;Top=100;Right=266;Bottom=142;" subject="EAID_D847D616_70DB_473a_A2A4_6665F938474C" seqno="2" style="DUID=EF7AF1A4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=251;Top=441;Right=386;Bottom=475;" subject="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" seqno="3" style="DUID=2764BA6B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=561;Top=395;Right=651;Bottom=430;" subject="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" seqno="4" style="DUID=F9ABFFFB;NSL=0;BCol=-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=449;Right=785;Bottom=502;" subject="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" seqno="5" style="DUID=21F5AD11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=471;Top=523;Right=599;Bottom=558;" subject="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" seqno="6" style="DUID=9D32EFCA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=739;Top=384;Right=863;Bottom=419;" subject="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" seqno="7" style="DUID=0FF73199;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=55;Top=156;Right=274;Bottom=226;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="8" style="DUID=8B156C14;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=933;Top=123;Right=1065;Bottom=193;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="9" style="DUID=AEA57ED3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=926;Top=298;Right=1070;Bottom=368;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="10" style="DUID=75CA37D0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=877;Top=410;Right=1120;Bottom=480;" subject="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" seqno="11" style="DUID=F37FE1F2;NSL=0;BCol=-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=299;Right=304;Bottom=369;" subject="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" seqno="12" style="DUID=E63636B8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=407;Top=116;Right=705;Bottom=265;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="13" style="DUID=05165D99;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="EX=43;EY=0;SX=0;SY=3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=59: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=578:-472$;" subject="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" style="Mode=3;EOID=9D32EFCA;SOID=21F5AD11;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A" style="Mode=3;EOID=05165D99;SOID=21F5AD11;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-13;SY=0;EX=-9;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" style="Mode=3;EOID=05165D99;SOID=9D32EFCA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -2919,10 +3038,31 @@
 					<element geometry="SX=-14;SY=0;EX=0;EY=-60;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=14:OX=-17: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=150:-250$;" subject="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" style="Mode=3;EOID=05165D99;SOID=E63636B8;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_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=8B156C14;SOID=05165D99;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" style="Mode=3;EOID=05165D99;SOID=F9ABFFFB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=60: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_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D" style="Mode=3;EOID=05165D99;SOID=35BBD5F7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EX=-2;EY=57;SX=100;SY=-8;EDGE=2;$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_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43" style="Mode=3;EOID=05165D99;SOID=EF7AF1A4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=16;EX=-28;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55" style="Mode=3;EOID=05165D99;SOID=2764BA6B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-9;EX=-74;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=46:OY=40: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=482:-467$;" subject="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" style="Mode=3;EOID=05165D99;SOID=2764BA6B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
+			<diagram xmi:id="EAID_67845F73_B29D_4ee6_BD89_820DD70FF597">
+				<model package="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" localID="486" owner="EAPK_41C6B86A_8D4D_4736_A1FA_8A0C58FD4C18" 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_6AC6185D_A375_4613_AFCB_66A3B11BB38F" seqno="1" style="DUID=D50240BB;"/>
+					<element geometry="Left=54;Top=134;Right=144;Bottom=172;" subject="EAID_E00B355C_D5C5_47f3_B950_E21372EF9B21" seqno="2" style="DUID=D4A3B7D6;"/>
+					<element geometry="Left=162;Top=134;Right=252;Bottom=172;" subject="EAID_14241140_2F4C_4084_BE6A_EFA5D96ED74A" seqno="3" style="DUID=CE6E12BF;"/>
+					<element geometry="Left=162;Top=246;Right=252;Bottom=284;" subject="EAID_A13336A0_37D5_43cd_94D4_876797E1E87C" seqno="4" style="DUID=D1C1DE60;"/>
+					<element geometry="Left=54;Top=246;Right=144;Bottom=284;" subject="EAID_EA826A3E_6246_47cf_8761_15FFA2CD7E45" seqno="5" style="DUID=6E166D48;"/>
+					<element geometry="Left=162;Top=42;Right=252;Bottom=80;" subject="EAID_23AD5812_9624_4cbc_A559_DABF00944929" seqno="6" style="DUID=BBFD5D70;"/>
+					<element geometry="Left=54;Top=334;Right=144;Bottom=372;" subject="EAID_E4601C78_01E7_4919_AA4D_221EF3851EAA" seqno="7" style="DUID=7E5FA0C6;"/>
+				</elements>
+			</diagram>
 		</diagrams>
 	</xmi:Extension>
 </xmi:XMI>
diff --git a/implementation/eFulfilment/xmi_conceptual_model/eFulfilment_CM.xml b/implementation/eFulfilment/xmi_conceptual_model/eFulfilment_CM.xml
index ad3841c1..8194d97d 100644
--- a/implementation/eFulfilment/xmi_conceptual_model/eFulfilment_CM.xml
+++ b/implementation/eFulfilment/xmi_conceptual_model/eFulfilment_CM.xml
@@ -4,1079 +4,1073 @@
 	<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="fulfilment">
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" 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.">
-						<annotatedElement xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-					</ownedComment>
+				<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.">
+					<annotatedElement xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+				</ownedComment>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" name="at-voc-new:transport-means-type"/>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" name="at-voc-new:handling-instruction"/>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" name="at-voc-new:allowance-charge-reason"/>
+				<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"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_B4CC_4c60_9D01_BAAA3CCE5A27" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst577190_0947_4041_ACDC_BC0C377734AF" name="epo-ful:hasMaximumTemperature" association="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__0947_4041_ACDC_BC0C377734AF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__0947_4041_ACDC_BC0C377734AF" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0CA1D5_5E5E_4028_8583_6B810BB672CD" name="epo-ful:hasMinimumTemperature" association="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005__5E5E_4028_8583_6B810BB672CD" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__5E5E_4028_8583_6B810BB672CD" value="1"/>
+					</ownedAttribute>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" 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"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_B4CC_4c60_9D01_BAAA3CCE5A27" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst577190_0947_4041_ACDC_BC0C377734AF" name="epo-ful:hasMaximumTemperature" association="EAID_B1577190_0947_4041_ACDC_BC0C377734AF">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000003__0947_4041_ACDC_BC0C377734AF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004__0947_4041_ACDC_BC0C377734AF" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0CA1D5_5E5E_4028_8583_6B810BB672CD" name="epo-ful:hasMinimumTemperature" association="EAID_F70CA1D5_5E5E_4028_8583_6B810BB672CD">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005__5E5E_4028_8583_6B810BB672CD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__5E5E_4028_8583_6B810BB672CD" value="1"/>
-						</ownedAttribute>
-					</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_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_1EB08725_66E0_423d_BCFD_75E48766202A">
-						<memberEnd xmi:idref="EAID_dstB08725_66E0_423d_BCFD_75E48766202A"/>
-						<memberEnd xmi:idref="EAID_srcB08725_66E0_423d_BCFD_75E48766202A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB08725_66E0_423d_BCFD_75E48766202A" association="EAID_1EB08725_66E0_423d_BCFD_75E48766202A">
-							<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" name="epo-ful:AbstractContainer">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CA48A297_FEB1_4283_9D35_59D451D012B9" name="epo-ful:isReturnableMaterial">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_FEB1_4283_9D35_59D451D012B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_FEB1_4283_9D35_59D451D012B9" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_ECD349A4_390B_47a1_A963_CBCFECFD7BC2" name="epo-ful:isHazardousRisk">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_390B_47a1_A963_CBCFECFD7BC2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_390B_47a1_A963_CBCFECFD7BC2" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst67DB54_9519_42f6_BD3B_F46B589F376C" name="epo-ful:hasGrossWeight" association="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__9519_42f6_BD3B_F46B589F376C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__9519_42f6_BD3B_F46B589F376C" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst490F76_8D40_4d74_97D4_F3871039E80A" name="epo-ful:hasNetWeight" association="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__8D40_4d74_97D4_F3871039E80A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__8D40_4d74_97D4_F3871039E80A" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1AB34D_EA8C_44fb_B232_AA4B138F066B" name="epo-ful:hasLength" association="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__EA8C_44fb_B232_AA4B138F066B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__EA8C_44fb_B232_AA4B138F066B" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB08725_66E0_423d_BCFD_75E48766202A" name="epo-ful:hasTemperatureSpecification" association="EAID_1EB08725_66E0_423d_BCFD_75E48766202A">
-							<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__66E0_423d_BCFD_75E48766202A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__66E0_423d_BCFD_75E48766202A" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96" name="epo-ful:hasGrossVolume" association="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__2186_4280_A2C0_6DC585D1EE96" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__2186_4280_A2C0_6DC585D1EE96" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A" name="epo-ful:hasWidth" association="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__09FD_4b6e_8D27_8D44BA5CA36A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__09FD_4b6e_8D27_8D44BA5CA36A" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDEA454_B158_4e44_91D6_F1D258049A37" name="epo-ful:hasHeight" association="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__B158_4e44_91D6_F1D258049A37" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__B158_4e44_91D6_F1D258049A37" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222" name="epo-ful:hasTotalGoodsItemQuantity" association="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__5BDB_4176_9418_BB9B2E957222" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__5BDB_4176_9418_BB9B2E957222" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" name="adms:identifier" association="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__BDFE_4be4_BDD9_5E0D69EFDD3D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__BDFE_4be4_BDD9_5E0D69EFDD3D" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668" name="epo-ful:hasNetVolume" association="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
-							<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__1471_4d6b_9B9F_2E0BBE858668" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__1471_4d6b_9B9F_2E0BBE858668" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<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_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_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_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_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_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_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_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_9099AF4F_0019_4768_B85A_99820F3E6307" name="epo-ful:TransportMeansOperator">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst693B40_13CE_47d1_A051_E627959E09EF" name="epo:playedBy" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-							<type xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__13CE_47d1_A051_E627959E09EF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__13CE_47d1_A051_E627959E09EF" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-						<memberEnd xmi:idref="EAID_dst693B40_13CE_47d1_A051_E627959E09EF"/>
-						<memberEnd xmi:idref="EAID_src693B40_13CE_47d1_A051_E627959E09EF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src693B40_13CE_47d1_A051_E627959E09EF" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-							<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
-						<memberEnd xmi:idref="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641"/>
-						<memberEnd xmi:idref="EAID_src19D833_E02D_4663_AAEC_E4DC2FD36641"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src19D833_E02D_4663_AAEC_E4DC2FD36641" association="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
-							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C215EC75_82FD_45d3_832A_B3989A897692" name="epo-ful:GoodsItem">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA6863A_1079_4af7_AE53_091E3E0514AF" name="epo-ful:hasTraceID" association="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__1079_4af7_AE53_091E3E0514AF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__1079_4af7_AE53_091E3E0514AF" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F" name="epo-ful:hasDeclaredStatisticalValue" association="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__4390_46da_9255_1C4C8BE7B02F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__4390_46da_9255_1C4C8BE7B02F" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7" name="epo-ful:refersToDespatchLine" association="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__F949_4607_84FB_38E506A895B7" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__F949_4607_84FB_38E506A895B7" value="1"/>
-						</ownedAttribute>
-					</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_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_D57BCA2B_F949_4607_84FB_38E506A895B7">
-						<memberEnd xmi:idref="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7"/>
-						<memberEnd xmi:idref="EAID_src7BCA2B_F949_4607_84FB_38E506A895B7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7BCA2B_F949_4607_84FB_38E506A895B7" association="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
-							<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
-						<memberEnd xmi:idref="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F"/>
-						<memberEnd xmi:idref="EAID_srcAB192B_82DE_4520_A51F_2425A6DBF32F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAB192B_82DE_4520_A51F_2425A6DBF32F" association="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
-							<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" name="epo-ful:ShipmentAgreement">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8" name="epo-ful:agreedBySeller" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-							<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__7B20_475e_895E_9E7177239DE8" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__7B20_475e_895E_9E7177239DE8" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3" name="epo-ful:agreedByBuyer" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__89A0_4039_8257_A68F3DC30CC3" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__89A0_4039_8257_A68F3DC30CC3" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-						<memberEnd xmi:idref="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8"/>
-						<memberEnd xmi:idref="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-						<memberEnd xmi:idref="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
-						<memberEnd xmi:idref="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
-						<memberEnd xmi:idref="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538"/>
-						<memberEnd xmi:idref="EAID_src78D73E_7BA7_4bf0_9D36_DD776DFC8538"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src78D73E_7BA7_4bf0_9D36_DD776DFC8538" association="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" name="epo-ful:TransportEquipmentSeal">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC5B633_908F_48e5_82F6_C10FBDBF1DE3" name="adms:identifier" association="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__908F_48e5_82F6_C10FBDBF1DE3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__908F_48e5_82F6_C10FBDBF1DE3" value="1"/>
-						</ownedAttribute>
-					</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_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
-						<memberEnd xmi:idref="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5"/>
-						<memberEnd xmi:idref="EAID_src43B026_B4D0_426b_AB39_1D8D064F10A5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src43B026_B4D0_426b_AB39_1D8D064F10A5" association="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
-							<type xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" name="epo-ful:TransportMeans">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst553B39_DB4D_4388_9D1B_8C8E24EB522C" name="epo-ful:hasVehicleSegmentID" association="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__DB4D_4388_9D1B_8C8E24EB522C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__DB4D_4388_9D1B_8C8E24EB522C" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641" name="epo:hasDriverPerson" association="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
-							<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__E02D_4663_AAEC_E4DC2FD36641" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__E02D_4663_AAEC_E4DC2FD36641" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst89FF3B_9E63_4b65_9418_542A437B67E4" name="epo-ful:hasVehicleID" association="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__9E63_4b65_9418_542A437B67E4" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__9E63_4b65_9418_542A437B67E4" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E" supplier="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" client="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" supplier="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" client="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-					<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_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_4E226C0E_C79A_44dd_9052_55D13D688E6F">
-						<memberEnd xmi:idref="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F"/>
-						<memberEnd xmi:idref="EAID_src226C0E_C79A_44dd_9052_55D13D688E6F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src226C0E_C79A_44dd_9052_55D13D688E6F" association="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" name="epo-ful:ShipmentStage">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_480BB6B3_EC84_4048_8BB4_14680AEE519E" name="epo-ful:isHazardousRisk">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051_EC84_4048_8BB4_14680AEE519E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_EC84_4048_8BB4_14680AEE519E" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEAF5CC_EFD4_41e4_BD2B_E606551D42C8" name="epo-ful:hasDepartureShipmentInformation" association="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__EFD4_41e4_BD2B_E606551D42C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__EFD4_41e4_BD2B_E606551D42C8" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F" name="epo-ful:usesTransportMeans" association="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
-							<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__C79A_44dd_9052_55D13D688E6F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__C79A_44dd_9052_55D13D688E6F" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst091EE9_B21F_4dae_99AF_66217D43BDA9" name="adms:identifier" association="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__B21F_4dae_99AF_66217D43BDA9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__B21F_4dae_99AF_66217D43BDA9" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF3C1F4_862B_474a_B6CF_EA7D771FF0D0" name="epo:hasArrivalShipmentInformation" association="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__862B_474a_B6CF_EA7D771FF0D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__862B_474a_B6CF_EA7D771FF0D0" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E" name="epo:specifiesCarrier" association="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-							<type xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__6CDE_4da6_A4A1_7512C3E0591E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__6CDE_4da6_A4A1_7512C3E0591E" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
-						<memberEnd xmi:idref="EAID_dstEAF5CC_EFD4_41e4_BD2B_E606551D42C8"/>
-						<memberEnd xmi:idref="EAID_srcEAF5CC_EFD4_41e4_BD2B_E606551D42C8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEAF5CC_EFD4_41e4_BD2B_E606551D42C8" association="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-						</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_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
-						<memberEnd xmi:idref="EAID_dstF3C1F4_862B_474a_B6CF_EA7D771FF0D0"/>
-						<memberEnd xmi:idref="EAID_srcF3C1F4_862B_474a_B6CF_EA7D771FF0D0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF3C1F4_862B_474a_B6CF_EA7D771FF0D0" association="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-						<memberEnd xmi:idref="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E"/>
-						<memberEnd xmi:idref="EAID_src8C13D8_6CDE_4da6_A4A1_7512C3E0591E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C13D8_6CDE_4da6_A4A1_7512C3E0591E" association="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
-						<memberEnd xmi:idref="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288"/>
-						<memberEnd xmi:idref="EAID_src18BED8_E786_4a53_A9AC_93AD55744288"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18BED8_E786_4a53_A9AC_93AD55744288" association="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
-						<memberEnd xmi:idref="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493"/>
-						<memberEnd xmi:idref="EAID_src815C4E_A421_45ce_B940_8E07DDB6E493"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src815C4E_A421_45ce_B940_8E07DDB6E493" association="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
-						<memberEnd xmi:idref="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D"/>
-						<memberEnd xmi:idref="EAID_src3AAD71_420E_40ee_B221_B2A54F890D2D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAD71_420E_40ee_B221_B2A54F890D2D" association="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" name="epo-ful:Package">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_881A49EE_A6E6_40c9_A28F_8220939D14DE" name="epo-ful:hasPackagingTypeDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063_A6E6_40c9_A28F_8220939D14DE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_A6E6_40c9_A28F_8220939D14DE" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<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"/>
-							<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">
-							<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__BBC6_421b_A4B4_978BEF67A273" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__BBC6_421b_A4B4_978BEF67A273" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" supplier="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" client="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
-						<memberEnd xmi:idref="EAID_dst19EBC4_BBC6_421b_A4B4_978BEF67A273"/>
-						<memberEnd xmi:idref="EAID_src19EBC4_BBC6_421b_A4B4_978BEF67A273"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src19EBC4_BBC6_421b_A4B4_978BEF67A273" association="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
-							<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" name="epo-ful:TransportEquipment">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DC3820D0_EB0A_427c_A17C_65B03FDCF40F" name="epo-ful:isReturnable">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069_EB0A_427c_A17C_65B03FDCF40F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_EB0A_427c_A17C_65B03FDCF40F" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F4DDD2E5_7ADB_4037_93A6_F976EB5C73E3" name="epo-ful:isRefrigerated">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071_7ADB_4037_93A6_F976EB5C73E3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072_7ADB_4037_93A6_F976EB5C73E3" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_165B6A20_8B37_49ca_8F2C_1FBABF4D6EEB" name="dct:description">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073_8B37_49ca_8F2C_1FBABF4D6EEB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074_8B37_49ca_8F2C_1FBABF4D6EEB" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C3EB3CEC_F24F_4008_9207_2EEED0B5107B" name="epo-ful:isPowerIndicated">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075_F24F_4008_9207_2EEED0B5107B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076_F24F_4008_9207_2EEED0B5107B" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst707B7A_A266_46a0_9CA9_EBF5B2C9D483" name="adms:identifier" association="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__A266_46a0_9CA9_EBF5B2C9D483" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__A266_46a0_9CA9_EBF5B2C9D483" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5" name="epo-ful:hasTransportEquipmentSeal" association="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
-							<type xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__B4D0_426b_AB39_1D8D064F10A5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__B4D0_426b_AB39_1D8D064F10A5" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_506D198C_F014_4656_84A2_E0CF23F0C305" supplier="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" client="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-					<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:Dependency" xmi:id="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B" supplier="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" client="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
-						<memberEnd xmi:idref="EAID_dst907E97_8458_42ef_B2AC_3DB623B8AA78"/>
-						<memberEnd xmi:idref="EAID_src907E97_8458_42ef_B2AC_3DB623B8AA78"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src907E97_8458_42ef_B2AC_3DB623B8AA78" association="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
-							<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" name="epo-ful:Notifier">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
-						<memberEnd xmi:idref="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4"/>
-						<memberEnd xmi:idref="EAID_src454BB2_FC26_49ad_948C_F84C001C68E4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src454BB2_FC26_49ad_948C_F84C001C68E4" association="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" name="epo-ful:FreightForwarder">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
-						<memberEnd xmi:idref="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161"/>
-						<memberEnd xmi:idref="EAID_src018782_9090_4ec2_95E6_BC660BB6F161"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src018782_9090_4ec2_95E6_BC660BB6F161" association="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" name="epo-ful:Consignment">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0C96E1C5_7220_4034_BC9A_6674B6211C12" name="epo-ful:hasVehicleDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081_7220_4034_BC9A_6674B6211C12" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082_7220_4034_BC9A_6674B6211C12" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A465985F_DAD6_48b6_8755_A371B92EC409" name="epo-ful:isHazardousRisk">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_DAD6_48b6_8755_A371B92EC409" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_DAD6_48b6_8755_A371B92EC409" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_59AE7F91_C586_414f_89AF_5C1F2A092CFA" name="epo-ful:hasHandlingInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085_C586_414f_89AF_5C1F2A092CFA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086_C586_414f_89AF_5C1F2A092CFA" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9172E21F_7B8B_47fb_9485_A176EEF63EAF" name="epo-ful:hasCarrierServiceInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087_7B8B_47fb_9485_A176EEF63EAF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088_7B8B_47fb_9485_A176EEF63EAF" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C2B6DE07_3B4E_485f_8845_AD1578623CFD" name="epo-ful:hasSpecialInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089_3B4E_485f_8845_AD1578623CFD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090_3B4E_485f_8845_AD1578623CFD" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D6CAB38F_B906_4f3f_A512_1FC6AB793A4F" name="epo-ful:hasDeliveryInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091_B906_4f3f_A512_1FC6AB793A4F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092_B906_4f3f_A512_1FC6AB793A4F" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_402D77CE_15E9_4ddd_AE49_1C64B0078574" name="epo-ful:hasSpecialServiceInstruction">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093_15E9_4ddd_AE49_1C64B0078574" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094_15E9_4ddd_AE49_1C64B0078574" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148" name="epo-ful:hasFreightAllowanceCharge" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__E0F4_4d8a_9787_DB2496C70148" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__E0F4_4d8a_9787_DB2496C70148" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst702782_CA5B_4035_84B7_1E5035469B29" name="adms:identifier" association="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
-							<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__CA5B_4035_84B7_1E5035469B29" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__CA5B_4035_84B7_1E5035469B29" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288" name="epo-ful:hasPreCarriageShipmentStage" association="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099__E786_4a53_A9AC_93AD55744288" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__E786_4a53_A9AC_93AD55744288" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493" name="epo-ful:hasOnCarriageShipmentStage" association="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
-							<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101__A421_45ce_B940_8E07DDB6E493" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__A421_45ce_B940_8E07DDB6E493" value="*"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9FE66A_E025_4563_9A59_461990838D96" name="epo-ful:hasConsignmentInvoiceValue" association="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<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_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="*"/>
-						</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"/>
-						</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"/>
-						</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="*"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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="*"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-						<memberEnd xmi:idref="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148"/>
-						<memberEnd xmi:idref="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</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_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_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_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_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_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_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:Dependency" xmi:id="EAID_7D11F407_8C9D_4214_8774_289769C50390" supplier="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" client="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-					<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_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_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_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
-						<memberEnd xmi:idref="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A"/>
-						<memberEnd xmi:idref="EAID_src665A13_AEF0_4cf6_ACC2_F2FE3A90C76A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" association="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
-							<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"/>
-						<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_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_FBFFE3B6_925B_4b80_A519_F160F8927173">
-						<memberEnd xmi:idref="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173"/>
-						<memberEnd xmi:idref="EAID_srcFFE3B6_925B_4b80_A519_F160F8927173"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFFE3B6_925B_4b80_A519_F160F8927173" association="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173">
-							<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
-						<memberEnd xmi:idref="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096"/>
-						<memberEnd xmi:idref="EAID_srcB12A9D_029A_4c46_9583_5FF42CA3E096"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB12A9D_029A_4c46_9583_5FF42CA3E096" association="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</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"/>
-							<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"/>
-						</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_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-							<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"/>
-						</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"/>
-						</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"/>
-						</ownedAttribute>
-					</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_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
-						<memberEnd xmi:idref="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5"/>
-						<memberEnd xmi:idref="EAID_srcDD570C_FEF5_4342_A009_CBC3D19B20B5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDD570C_FEF5_4342_A009_CBC3D19B20B5" association="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-						</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_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
-						<memberEnd xmi:idref="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
-						<memberEnd xmi:idref="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0" association="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
-						<memberEnd xmi:idref="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D"/>
-						<memberEnd xmi:idref="EAID_src1E7032_36A3_4c8b_8FFF_C8B67B4CF87D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1E7032_36A3_4c8b_8FFF_C8B67B4CF87D" association="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
-						<memberEnd xmi:idref="EAID_dst77B614_F9B2_464f_9F87_43543F10AEA4"/>
-						<memberEnd xmi:idref="EAID_src77B614_F9B2_464f_9F87_43543F10AEA4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src77B614_F9B2_464f_9F87_43543F10AEA4" association="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
-							<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
-						<memberEnd xmi:idref="EAID_dst183E35_6937_4f66_AFD3_4B863C07ABEE"/>
-						<memberEnd xmi:idref="EAID_src183E35_6937_4f66_AFD3_4B863C07ABEE"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src183E35_6937_4f66_AFD3_4B863C07ABEE" association="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</ownedEnd>
-					</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="*"/>
-							<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="*"/>
-							<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="*"/>
-						</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="*"/>
-						</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"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
-						<memberEnd xmi:idref="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C"/>
-						<memberEnd xmi:idref="EAID_src8A2FCD_752D_45a9_9023_77697592FF3C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8A2FCD_752D_45a9_9023_77697592FF3C" association="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</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"/>
-							<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="*"/>
-							<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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</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"/>
-						</ownedAttribute>
-					</packagedElement>
-					<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_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
-						<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
-						<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6" association="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</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_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-						<memberEnd xmi:idref="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
-						<memberEnd xmi:idref="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" association="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
-						<memberEnd xmi:idref="EAID_dstAEE9C5_EA86_424b_9486_C235014D3693"/>
-						<memberEnd xmi:idref="EAID_srcAEE9C5_EA86_424b_9486_C235014D3693"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAEE9C5_EA86_424b_9486_C235014D3693" association="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" name="epo-ful:Despatcher">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
-						<memberEnd xmi:idref="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721"/>
-						<memberEnd xmi:idref="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721" association="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
-						<memberEnd xmi:idref="EAID_dst1C243F_824F_48fd_8601_BEA52AB5E730"/>
-						<memberEnd xmi:idref="EAID_src1C243F_824F_48fd_8601_BEA52AB5E730"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1C243F_824F_48fd_8601_BEA52AB5E730" association="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<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"/>
-						</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"/>
-						</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="*"/>
-						</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_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-							<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"/>
-						</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"/>
-						</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="*"/>
-						</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="*"/>
-						</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="*"/>
-						</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"/>
-						</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="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
-						<memberEnd xmi:idref="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9"/>
-						<memberEnd xmi:idref="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9" association="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
-						<memberEnd xmi:idref="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B"/>
-						<memberEnd xmi:idref="EAID_src127BB3_2702_45c1_99BF_B659211FD91B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src127BB3_2702_45c1_99BF_B659211FD91B" association="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084" supplier="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" client="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-						<memberEnd xmi:idref="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
-						<memberEnd xmi:idref="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" association="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
-						<memberEnd xmi:idref="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
-						<memberEnd xmi:idref="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20" association="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</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 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:Package" xmi:id="EAPK_E60B4FFC_6069_40c7_9E18_F67462337421" 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"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" name="at-voc-new:handling-instruction"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" name="at-voc-new:packaging-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" name="at-voc-new:size-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" name="at-voc-new:transport-equipment-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" name="at-voc-new:transport-means-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" name="at-voc-new:transport-mode"/>
+				<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_1EB08725_66E0_423d_BCFD_75E48766202A">
+					<memberEnd xmi:idref="EAID_dstB08725_66E0_423d_BCFD_75E48766202A"/>
+					<memberEnd xmi:idref="EAID_srcB08725_66E0_423d_BCFD_75E48766202A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB08725_66E0_423d_BCFD_75E48766202A" association="EAID_1EB08725_66E0_423d_BCFD_75E48766202A">
+						<type xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" name="epo-ful:AbstractContainer">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_CA48A297_FEB1_4283_9D35_59D451D012B9" name="epo-ful:isReturnableMaterial">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_FEB1_4283_9D35_59D451D012B9" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_FEB1_4283_9D35_59D451D012B9" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_ECD349A4_390B_47a1_A963_CBCFECFD7BC2" name="epo-ful:isHazardousRisk">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_390B_47a1_A963_CBCFECFD7BC2" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_390B_47a1_A963_CBCFECFD7BC2" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst67DB54_9519_42f6_BD3B_F46B589F376C" name="epo-ful:hasGrossWeight" association="EAID_0167DB54_9519_42f6_BD3B_F46B589F376C">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011__9519_42f6_BD3B_F46B589F376C" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__9519_42f6_BD3B_F46B589F376C" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst490F76_8D40_4d74_97D4_F3871039E80A" name="epo-ful:hasNetWeight" association="EAID_05490F76_8D40_4d74_97D4_F3871039E80A">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013__8D40_4d74_97D4_F3871039E80A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__8D40_4d74_97D4_F3871039E80A" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1AB34D_EA8C_44fb_B232_AA4B138F066B" name="epo-ful:hasLength" association="EAID_0F1AB34D_EA8C_44fb_B232_AA4B138F066B">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015__EA8C_44fb_B232_AA4B138F066B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__EA8C_44fb_B232_AA4B138F066B" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstB08725_66E0_423d_BCFD_75E48766202A" name="epo-ful:hasTemperatureSpecification" association="EAID_1EB08725_66E0_423d_BCFD_75E48766202A">
+						<type xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000017__66E0_423d_BCFD_75E48766202A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__66E0_423d_BCFD_75E48766202A" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCAEC7F_2186_4280_A2C0_6DC585D1EE96" name="epo-ful:hasGrossVolume" association="EAID_2ECAEC7F_2186_4280_A2C0_6DC585D1EE96">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000019__2186_4280_A2C0_6DC585D1EE96" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__2186_4280_A2C0_6DC585D1EE96" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst0594A4_09FD_4b6e_8D27_8D44BA5CA36A" name="epo-ful:hasWidth" association="EAID_770594A4_09FD_4b6e_8D27_8D44BA5CA36A">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000021__09FD_4b6e_8D27_8D44BA5CA36A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__09FD_4b6e_8D27_8D44BA5CA36A" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDEA454_B158_4e44_91D6_F1D258049A37" name="epo-ful:hasHeight" association="EAID_87DEA454_B158_4e44_91D6_F1D258049A37">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000023__B158_4e44_91D6_F1D258049A37" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__B158_4e44_91D6_F1D258049A37" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstE4577A_5BDB_4176_9418_BB9B2E957222" name="epo-ful:hasTotalGoodsItemQuantity" association="EAID_C5E4577A_5BDB_4176_9418_BB9B2E957222">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000025__5BDB_4176_9418_BB9B2E957222" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__5BDB_4176_9418_BB9B2E957222" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D" name="adms:identifier" association="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000027__BDFE_4be4_BDD9_5E0D69EFDD3D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__BDFE_4be4_BDD9_5E0D69EFDD3D" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2388C8_1471_4d6b_9B9F_2E0BBE858668" name="epo-ful:hasNetVolume" association="EAID_FA2388C8_1471_4d6b_9B9F_2E0BBE858668">
+						<type xmi:idref="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000029__1471_4d6b_9B9F_2E0BBE858668" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__1471_4d6b_9B9F_2E0BBE858668" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<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_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_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_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_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_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_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_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:Enumeration" xmi:id="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" name="at-voc-new:transport-mode"/>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" name="epo-ful:TransportMeansOperator">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst693B40_13CE_47d1_A051_E627959E09EF" name="epo:playedBy" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+						<type xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000031__13CE_47d1_A051_E627959E09EF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__13CE_47d1_A051_E627959E09EF" value="1"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+					<memberEnd xmi:idref="EAID_dst693B40_13CE_47d1_A051_E627959E09EF"/>
+					<memberEnd xmi:idref="EAID_src693B40_13CE_47d1_A051_E627959E09EF"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src693B40_13CE_47d1_A051_E627959E09EF" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+						<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
+					<memberEnd xmi:idref="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641"/>
+					<memberEnd xmi:idref="EAID_src19D833_E02D_4663_AAEC_E4DC2FD36641"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src19D833_E02D_4663_AAEC_E4DC2FD36641" association="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
+						<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_C215EC75_82FD_45d3_832A_B3989A897692" name="epo-ful:GoodsItem">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstA6863A_1079_4af7_AE53_091E3E0514AF" name="epo-ful:hasTraceID" association="EAID_51A6863A_1079_4af7_AE53_091E3E0514AF">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000033__1079_4af7_AE53_091E3E0514AF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__1079_4af7_AE53_091E3E0514AF" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst852C7E_4390_46da_9255_1C4C8BE7B02F" name="epo-ful:hasDeclaredStatisticalValue" association="EAID_AB852C7E_4390_46da_9255_1C4C8BE7B02F">
+						<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000035__4390_46da_9255_1C4C8BE7B02F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__4390_46da_9255_1C4C8BE7B02F" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7" name="epo-ful:refersToDespatchLine" association="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
+						<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__F949_4607_84FB_38E506A895B7" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__F949_4607_84FB_38E506A895B7" value="1"/>
+					</ownedAttribute>
+				</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_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_D57BCA2B_F949_4607_84FB_38E506A895B7">
+					<memberEnd xmi:idref="EAID_dst7BCA2B_F949_4607_84FB_38E506A895B7"/>
+					<memberEnd xmi:idref="EAID_src7BCA2B_F949_4607_84FB_38E506A895B7"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7BCA2B_F949_4607_84FB_38E506A895B7" association="EAID_D57BCA2B_F949_4607_84FB_38E506A895B7">
+						<type xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
+					<memberEnd xmi:idref="EAID_dstAB192B_82DE_4520_A51F_2425A6DBF32F"/>
+					<memberEnd xmi:idref="EAID_srcAB192B_82DE_4520_A51F_2425A6DBF32F"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAB192B_82DE_4520_A51F_2425A6DBF32F" association="EAID_7EAB192B_82DE_4520_A51F_2425A6DBF32F">
+						<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" name="epo-ful:ShipmentAgreement">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8" name="epo-ful:agreedBySeller" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+						<type xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000039__7B20_475e_895E_9E7177239DE8" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__7B20_475e_895E_9E7177239DE8" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3" name="epo-ful:agreedByBuyer" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+						<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000041__89A0_4039_8257_A68F3DC30CC3" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__89A0_4039_8257_A68F3DC30CC3" value="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+					<memberEnd xmi:idref="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8"/>
+					<memberEnd xmi:idref="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+						<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+					<memberEnd xmi:idref="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
+					<memberEnd xmi:idref="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+						<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
+					<memberEnd xmi:idref="EAID_dst78D73E_7BA7_4bf0_9D36_DD776DFC8538"/>
+					<memberEnd xmi:idref="EAID_src78D73E_7BA7_4bf0_9D36_DD776DFC8538"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src78D73E_7BA7_4bf0_9D36_DD776DFC8538" association="EAID_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" name="at-voc-new:size-type"/>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" name="at-voc-new:transport-equipment-type"/>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" name="epo-ful:TransportEquipmentSeal">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC5B633_908F_48e5_82F6_C10FBDBF1DE3" name="adms:identifier" association="EAID_96C5B633_908F_48e5_82F6_C10FBDBF1DE3">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043__908F_48e5_82F6_C10FBDBF1DE3" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__908F_48e5_82F6_C10FBDBF1DE3" value="1"/>
+					</ownedAttribute>
+				</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_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
+					<memberEnd xmi:idref="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5"/>
+					<memberEnd xmi:idref="EAID_src43B026_B4D0_426b_AB39_1D8D064F10A5"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src43B026_B4D0_426b_AB39_1D8D064F10A5" association="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
+						<type xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" name="epo-ful:TransportMeans">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst553B39_DB4D_4388_9D1B_8C8E24EB522C" name="epo-ful:hasVehicleSegmentID" association="EAID_77553B39_DB4D_4388_9D1B_8C8E24EB522C">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__DB4D_4388_9D1B_8C8E24EB522C" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__DB4D_4388_9D1B_8C8E24EB522C" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst19D833_E02D_4663_AAEC_E4DC2FD36641" name="epo:hasDriverPerson" association="EAID_9219D833_E02D_4663_AAEC_E4DC2FD36641">
+						<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__E02D_4663_AAEC_E4DC2FD36641" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__E02D_4663_AAEC_E4DC2FD36641" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst89FF3B_9E63_4b65_9418_542A437B67E4" name="epo-ful:hasVehicleID" association="EAID_A489FF3B_9E63_4b65_9418_542A437B67E4">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__9E63_4b65_9418_542A437B67E4" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__9E63_4b65_9418_542A437B67E4" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E" supplier="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668" client="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" supplier="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470" client="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+				<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_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_4E226C0E_C79A_44dd_9052_55D13D688E6F">
+					<memberEnd xmi:idref="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F"/>
+					<memberEnd xmi:idref="EAID_src226C0E_C79A_44dd_9052_55D13D688E6F"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src226C0E_C79A_44dd_9052_55D13D688E6F" association="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" name="epo-ful:ShipmentStage">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_480BB6B3_EC84_4048_8BB4_14680AEE519E" name="epo-ful:isHazardousRisk">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051_EC84_4048_8BB4_14680AEE519E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_EC84_4048_8BB4_14680AEE519E" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEAF5CC_EFD4_41e4_BD2B_E606551D42C8" name="epo-ful:hasDepartureShipmentInformation" association="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053__EFD4_41e4_BD2B_E606551D42C8" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__EFD4_41e4_BD2B_E606551D42C8" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst226C0E_C79A_44dd_9052_55D13D688E6F" name="epo-ful:usesTransportMeans" association="EAID_4E226C0E_C79A_44dd_9052_55D13D688E6F">
+						<type xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055__C79A_44dd_9052_55D13D688E6F" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__C79A_44dd_9052_55D13D688E6F" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst091EE9_B21F_4dae_99AF_66217D43BDA9" name="adms:identifier" association="EAID_63091EE9_B21F_4dae_99AF_66217D43BDA9">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__B21F_4dae_99AF_66217D43BDA9" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__B21F_4dae_99AF_66217D43BDA9" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF3C1F4_862B_474a_B6CF_EA7D771FF0D0" name="epo:hasArrivalShipmentInformation" association="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__862B_474a_B6CF_EA7D771FF0D0" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__862B_474a_B6CF_EA7D771FF0D0" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E" name="epo:specifiesCarrier" association="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+						<type xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000061__6CDE_4da6_A4A1_7512C3E0591E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__6CDE_4da6_A4A1_7512C3E0591E" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
+					<memberEnd xmi:idref="EAID_dstEAF5CC_EFD4_41e4_BD2B_E606551D42C8"/>
+					<memberEnd xmi:idref="EAID_srcEAF5CC_EFD4_41e4_BD2B_E606551D42C8"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEAF5CC_EFD4_41e4_BD2B_E606551D42C8" association="EAID_1CEAF5CC_EFD4_41e4_BD2B_E606551D42C8">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+					</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_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
+					<memberEnd xmi:idref="EAID_dstF3C1F4_862B_474a_B6CF_EA7D771FF0D0"/>
+					<memberEnd xmi:idref="EAID_srcF3C1F4_862B_474a_B6CF_EA7D771FF0D0"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF3C1F4_862B_474a_B6CF_EA7D771FF0D0" association="EAID_A0F3C1F4_862B_474a_B6CF_EA7D771FF0D0">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+					<memberEnd xmi:idref="EAID_dst8C13D8_6CDE_4da6_A4A1_7512C3E0591E"/>
+					<memberEnd xmi:idref="EAID_src8C13D8_6CDE_4da6_A4A1_7512C3E0591E"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C13D8_6CDE_4da6_A4A1_7512C3E0591E" association="EAID_F48C13D8_6CDE_4da6_A4A1_7512C3E0591E">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
+					<memberEnd xmi:idref="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288"/>
+					<memberEnd xmi:idref="EAID_src18BED8_E786_4a53_A9AC_93AD55744288"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18BED8_E786_4a53_A9AC_93AD55744288" association="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
+					<memberEnd xmi:idref="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493"/>
+					<memberEnd xmi:idref="EAID_src815C4E_A421_45ce_B940_8E07DDB6E493"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src815C4E_A421_45ce_B940_8E07DDB6E493" association="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
+					<memberEnd xmi:idref="EAID_dst3AAD71_420E_40ee_B221_B2A54F890D2D"/>
+					<memberEnd xmi:idref="EAID_src3AAD71_420E_40ee_B221_B2A54F890D2D"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAD71_420E_40ee_B221_B2A54F890D2D" association="EAID_783AAD71_420E_40ee_B221_B2A54F890D2D">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" name="epo-ful:Package">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_881A49EE_A6E6_40c9_A28F_8220939D14DE" name="epo-ful:hasPackagingTypeDescription">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000063_A6E6_40c9_A28F_8220939D14DE" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_A6E6_40c9_A28F_8220939D14DE" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<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"/>
+						<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">
+						<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000067__BBC6_421b_A4B4_978BEF67A273" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__BBC6_421b_A4B4_978BEF67A273" value="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" supplier="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" client="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
+					<memberEnd xmi:idref="EAID_dst19EBC4_BBC6_421b_A4B4_978BEF67A273"/>
+					<memberEnd xmi:idref="EAID_src19EBC4_BBC6_421b_A4B4_978BEF67A273"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src19EBC4_BBC6_421b_A4B4_978BEF67A273" association="EAID_A219EBC4_BBC6_421b_A4B4_978BEF67A273">
+						<type xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" name="epo-ful:TransportEquipment">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DC3820D0_EB0A_427c_A17C_65B03FDCF40F" name="epo-ful:isReturnable">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000069_EB0A_427c_A17C_65B03FDCF40F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_EB0A_427c_A17C_65B03FDCF40F" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F4DDD2E5_7ADB_4037_93A6_F976EB5C73E3" name="epo-ful:isRefrigerated">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071_7ADB_4037_93A6_F976EB5C73E3" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072_7ADB_4037_93A6_F976EB5C73E3" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_165B6A20_8B37_49ca_8F2C_1FBABF4D6EEB" name="dct:description">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073_8B37_49ca_8F2C_1FBABF4D6EEB" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074_8B37_49ca_8F2C_1FBABF4D6EEB" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C3EB3CEC_F24F_4008_9207_2EEED0B5107B" name="epo-ful:isPowerIndicated">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000075_F24F_4008_9207_2EEED0B5107B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076_F24F_4008_9207_2EEED0B5107B" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst707B7A_A266_46a0_9CA9_EBF5B2C9D483" name="adms:identifier" association="EAID_5A707B7A_A266_46a0_9CA9_EBF5B2C9D483">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000077__A266_46a0_9CA9_EBF5B2C9D483" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__A266_46a0_9CA9_EBF5B2C9D483" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst43B026_B4D0_426b_AB39_1D8D064F10A5" name="epo-ful:hasTransportEquipmentSeal" association="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
+						<type xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000079__B4D0_426b_AB39_1D8D064F10A5" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__B4D0_426b_AB39_1D8D064F10A5" value="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_506D198C_F014_4656_84A2_E0CF23F0C305" supplier="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA" client="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+				<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:Dependency" xmi:id="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B" supplier="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" client="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
+					<memberEnd xmi:idref="EAID_dst907E97_8458_42ef_B2AC_3DB623B8AA78"/>
+					<memberEnd xmi:idref="EAID_src907E97_8458_42ef_B2AC_3DB623B8AA78"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src907E97_8458_42ef_B2AC_3DB623B8AA78" association="EAID_A3907E97_8458_42ef_B2AC_3DB623B8AA78">
+						<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" name="epo-ful:Notifier">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
+					<memberEnd xmi:idref="EAID_dst454BB2_FC26_49ad_948C_F84C001C68E4"/>
+					<memberEnd xmi:idref="EAID_src454BB2_FC26_49ad_948C_F84C001C68E4"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src454BB2_FC26_49ad_948C_F84C001C68E4" association="EAID_3C454BB2_FC26_49ad_948C_F84C001C68E4">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" name="epo-ful:FreightForwarder">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
+					<memberEnd xmi:idref="EAID_dst018782_9090_4ec2_95E6_BC660BB6F161"/>
+					<memberEnd xmi:idref="EAID_src018782_9090_4ec2_95E6_BC660BB6F161"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src018782_9090_4ec2_95E6_BC660BB6F161" association="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" name="epo-ful:Consignment">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0C96E1C5_7220_4034_BC9A_6674B6211C12" name="epo-ful:hasVehicleDescription">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000081_7220_4034_BC9A_6674B6211C12" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082_7220_4034_BC9A_6674B6211C12" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_A465985F_DAD6_48b6_8755_A371B92EC409" name="epo-ful:isHazardousRisk">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000083_DAD6_48b6_8755_A371B92EC409" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084_DAD6_48b6_8755_A371B92EC409" value="1"/>
+						<type xmi:idref="EAJava_xsd_boolean"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_59AE7F91_C586_414f_89AF_5C1F2A092CFA" name="epo-ful:hasHandlingInstruction">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000085_C586_414f_89AF_5C1F2A092CFA" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086_C586_414f_89AF_5C1F2A092CFA" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9172E21F_7B8B_47fb_9485_A176EEF63EAF" name="epo-ful:hasCarrierServiceInstruction">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087_7B8B_47fb_9485_A176EEF63EAF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088_7B8B_47fb_9485_A176EEF63EAF" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C2B6DE07_3B4E_485f_8845_AD1578623CFD" name="epo-ful:hasSpecialInstruction">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000089_3B4E_485f_8845_AD1578623CFD" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090_3B4E_485f_8845_AD1578623CFD" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D6CAB38F_B906_4f3f_A512_1FC6AB793A4F" name="epo-ful:hasDeliveryInstruction">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000091_B906_4f3f_A512_1FC6AB793A4F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092_B906_4f3f_A512_1FC6AB793A4F" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_402D77CE_15E9_4ddd_AE49_1C64B0078574" name="epo-ful:hasSpecialServiceInstruction">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093_15E9_4ddd_AE49_1C64B0078574" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094_15E9_4ddd_AE49_1C64B0078574" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148" name="epo-ful:hasFreightAllowanceCharge" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+						<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000095__E0F4_4d8a_9787_DB2496C70148" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__E0F4_4d8a_9787_DB2496C70148" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst702782_CA5B_4035_84B7_1E5035469B29" name="adms:identifier" association="EAID_11702782_CA5B_4035_84B7_1E5035469B29">
+						<type xmi:idref="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000097__CA5B_4035_84B7_1E5035469B29" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__CA5B_4035_84B7_1E5035469B29" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst18BED8_E786_4a53_A9AC_93AD55744288" name="epo-ful:hasPreCarriageShipmentStage" association="EAID_1D18BED8_E786_4a53_A9AC_93AD55744288">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000099__E786_4a53_A9AC_93AD55744288" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__E786_4a53_A9AC_93AD55744288" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst815C4E_A421_45ce_B940_8E07DDB6E493" name="epo-ful:hasOnCarriageShipmentStage" association="EAID_22815C4E_A421_45ce_B940_8E07DDB6E493">
+						<type xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101__A421_45ce_B940_8E07DDB6E493" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__A421_45ce_B940_8E07DDB6E493" value="*"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst9FE66A_E025_4563_9A59_461990838D96" name="epo-ful:hasConsignmentInvoiceValue" association="EAID_2E9FE66A_E025_4563_9A59_461990838D96">
+						<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+						<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_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="*"/>
+					</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"/>
+					</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"/>
+					</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="*"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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="*"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+					<memberEnd xmi:idref="EAID_dst3FA551_E0F4_4d8a_9787_DB2496C70148"/>
+					<memberEnd xmi:idref="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3FA551_E0F4_4d8a_9787_DB2496C70148" association="EAID_053FA551_E0F4_4d8a_9787_DB2496C70148">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</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_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_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_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_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_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_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:Dependency" xmi:id="EAID_7D11F407_8C9D_4214_8774_289769C50390" supplier="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" client="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+				<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_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_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_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+					<memberEnd xmi:idref="EAID_dst665A13_AEF0_4cf6_ACC2_F2FE3A90C76A"/>
+					<memberEnd xmi:idref="EAID_src665A13_AEF0_4cf6_ACC2_F2FE3A90C76A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src665A13_AEF0_4cf6_ACC2_F2FE3A90C76A" association="EAID_A0665A13_AEF0_4cf6_ACC2_F2FE3A90C76A">
+						<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"/>
+					<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_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_FBFFE3B6_925B_4b80_A519_F160F8927173">
+					<memberEnd xmi:idref="EAID_dstFFE3B6_925B_4b80_A519_F160F8927173"/>
+					<memberEnd xmi:idref="EAID_srcFFE3B6_925B_4b80_A519_F160F8927173"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFFE3B6_925B_4b80_A519_F160F8927173" association="EAID_FBFFE3B6_925B_4b80_A519_F160F8927173">
+						<type xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
+					<memberEnd xmi:idref="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096"/>
+					<memberEnd xmi:idref="EAID_srcB12A9D_029A_4c46_9583_5FF42CA3E096"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB12A9D_029A_4c46_9583_5FF42CA3E096" association="EAID_D6B12A9D_029A_4c46_9583_5FF42CA3E096">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" name="at-voc-new:packaging-type"/>
+				<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"/>
+						<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"/>
+					</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_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+						<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"/>
+					</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"/>
+					</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"/>
+					</ownedAttribute>
+				</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_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
+					<memberEnd xmi:idref="EAID_dstDD570C_FEF5_4342_A009_CBC3D19B20B5"/>
+					<memberEnd xmi:idref="EAID_srcDD570C_FEF5_4342_A009_CBC3D19B20B5"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDD570C_FEF5_4342_A009_CBC3D19B20B5" association="EAID_6ADD570C_FEF5_4342_A009_CBC3D19B20B5">
+						<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+					</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_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<memberEnd xmi:idref="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
+					<memberEnd xmi:idref="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0" association="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
+						<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
+					<memberEnd xmi:idref="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D"/>
+					<memberEnd xmi:idref="EAID_src1E7032_36A3_4c8b_8FFF_C8B67B4CF87D"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1E7032_36A3_4c8b_8FFF_C8B67B4CF87D" association="EAID_121E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
+					<memberEnd xmi:idref="EAID_dst77B614_F9B2_464f_9F87_43543F10AEA4"/>
+					<memberEnd xmi:idref="EAID_src77B614_F9B2_464f_9F87_43543F10AEA4"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src77B614_F9B2_464f_9F87_43543F10AEA4" association="EAID_EA77B614_F9B2_464f_9F87_43543F10AEA4">
+						<type xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
+					<memberEnd xmi:idref="EAID_dst183E35_6937_4f66_AFD3_4B863C07ABEE"/>
+					<memberEnd xmi:idref="EAID_src183E35_6937_4f66_AFD3_4B863C07ABEE"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src183E35_6937_4f66_AFD3_4B863C07ABEE" association="EAID_FD183E35_6937_4f66_AFD3_4B863C07ABEE">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					</ownedEnd>
+				</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="*"/>
+						<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="*"/>
+						<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="*"/>
+					</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="*"/>
+					</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"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
+					<memberEnd xmi:idref="EAID_dst8A2FCD_752D_45a9_9023_77697592FF3C"/>
+					<memberEnd xmi:idref="EAID_src8A2FCD_752D_45a9_9023_77697592FF3C"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8A2FCD_752D_45a9_9023_77697592FF3C" association="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</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"/>
+						<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="*"/>
+						<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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</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"/>
+					</ownedAttribute>
+				</packagedElement>
+				<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_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
+					<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
+					<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6" association="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					</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_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
+					<memberEnd xmi:idref="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
+					<memberEnd xmi:idref="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" association="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
+					<memberEnd xmi:idref="EAID_dstAEE9C5_EA86_424b_9486_C235014D3693"/>
+					<memberEnd xmi:idref="EAID_srcAEE9C5_EA86_424b_9486_C235014D3693"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAEE9C5_EA86_424b_9486_C235014D3693" association="EAID_79AEE9C5_EA86_424b_9486_C235014D3693">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" name="epo-ful:Despatcher">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
+					<memberEnd xmi:idref="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721"/>
+					<memberEnd xmi:idref="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721" association="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
+					<memberEnd xmi:idref="EAID_dst1C243F_824F_48fd_8601_BEA52AB5E730"/>
+					<memberEnd xmi:idref="EAID_src1C243F_824F_48fd_8601_BEA52AB5E730"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1C243F_824F_48fd_8601_BEA52AB5E730" association="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<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"/>
+					</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"/>
+					</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="*"/>
+					</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_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+						<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"/>
+					</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"/>
+					</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="*"/>
+					</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="*"/>
+					</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="*"/>
+					</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"/>
+					</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="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<memberEnd xmi:idref="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9"/>
+					<memberEnd xmi:idref="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9" association="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
+					<memberEnd xmi:idref="EAID_dst127BB3_2702_45c1_99BF_B659211FD91B"/>
+					<memberEnd xmi:idref="EAID_src127BB3_2702_45c1_99BF_B659211FD91B"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src127BB3_2702_45c1_99BF_B659211FD91B" association="EAID_6A127BB3_2702_45c1_99BF_B659211FD91B">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084" supplier="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568" client="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
+					<memberEnd xmi:idref="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
+					<memberEnd xmi:idref="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" association="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
+					<memberEnd xmi:idref="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
+					<memberEnd xmi:idref="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20" association="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</packagedElement>
+				<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"/>
+				<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_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" name="datatype">
@@ -1089,7 +1083,7 @@
 				<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_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_85FB2EE8_AEBD_45d4_92DD_8FC795FDE413" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -1184,7 +1178,7 @@
 				<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"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_84F1_8A3969FE662E" text="0..1" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEBD_45d4_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEBD_45d4_84F1_8A3969FE662E" x="308" y="435" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEBD_45d4_84F1_8A3969FE662E" x="506" y="525"/>
@@ -1330,7 +1324,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AEBD_45d4_BD03_7B202CFA4807" x="752" y="486"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A" isFrame="false" modelElement="EAPK_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -2070,7 +2064,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0A9A_43f4_9445_B3D0C269B4E6" x="1616" y="1112"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486" isFrame="false" modelElement="EAPK_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -2245,7 +2239,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_85F8_4c7e_A987_53BA66264912" x="595" y="423"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4" isFrame="false" modelElement="EAPK_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -2478,7 +2472,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_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0E0367BE_EF6C_459c_9C87_3B64208EE574" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -2730,7 +2724,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_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_9F7EC64C_05DC_429f_B68B_6CE04C3F8991" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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"/>
@@ -2912,171 +2906,171 @@
 				<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_640DD6F6_7223_4501_835C_1E24699C7872">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_1BD1C3F1_A1B2_4395_9499_3C88CA228A42" isFrame="false" modelElement="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D">
 			<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="524" y="229" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_98CF_6753815E5C67" x="207" y="237" width="121" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_99EF_E09436BF89DC" modelElement="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_99EF_E09436BF89DC" text="epo-ful:DespatchLine"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_99EF_E09436BF89DC" x="445" y="94" width="271" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_99EF_E09436BF89DC" x="128" y="102" width="271" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_B49F_D657B2ABC394" modelElement="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_B49F_D657B2ABC394" text="epo-ful:Consignment"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_B49F_D657B2ABC394" x="453" y="363" width="255" height="127"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_B49F_D657B2ABC394" x="136" y="371" width="255" height="127"/>
 			</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="859" y="407" width="117" height="41"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_8568_C49C5DA11831" x="542" y="415" width="117" height="41"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_AAE5_65D2B64C35E1" x="768" y="260" width="300" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_AAE5_65D2B64C35E1" x="451" y="268" width="300" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_B1E8_3925D69F40D4" modelElement="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_B1E8_3925D69F40D4" text="epo-ord:TaxInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_B1E8_3925D69F40D4" x="873" y="130" width="195" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_B1E8_3925D69F40D4" x="556" y="138" width="195" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_9B44_2FCDD6AB5C9D" x="1174" y="246" width="267" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_9B44_2FCDD6AB5C9D" x="857" y="254" width="267" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_970E_3D4CAF26A2F5" modelElement="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_A1B2_4395_970E_3D4CAF26A2F5" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_970E_3D4CAF26A2F5" text="at-voc-new:allowance-charge-reason"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_970E_3D4CAF26A2F5" x="768" y="134" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_970E_3D4CAF26A2F5" x="451" y="142" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_A67D_5F0D11370DF4" modelElement="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_A67D_5F0D11370DF4" text="epo-cat:Price"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_A67D_5F0D11370DF4" x="1262" y="392" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_A67D_5F0D11370DF4" x="945" y="400" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_AAE9_7F444FFEA26A" modelElement="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_A1B2_4395_AAE9_7F444FFEA26A" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_A1B2_4395_AAE9_7F444FFEA26A" text="at-voc-new:tax-category"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_AAE9_7F444FFEA26A" x="979" y="30" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_A1B2_4395_AAE9_7F444FFEA26A" x="662" y="38" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1BD1C3F1_A1B2_4395_93D9_9D4729194EA6" modelElement="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_A1B2_4395_93D9_9D4729194EA6" text="enumeration"/>
 				<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="873" y="30" width="90" height="60"/>
+				<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="1089" y="277" width="83" height="14"/>
+					<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="1155" y="300" width="17" height="14"/>
+					<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="1068" y="295"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_91D4_F6387465413F" x="1174" y="295"/>
+				<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_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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9583_5FF42CA3E096" x="519" y="326" width="122" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9583_5FF42CA3E096" x="205" y="334" width="122" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_9583_5FF42CA3E096" text="1" modelElement="EAID_dstB12A9D_029A_4c46_9583_5FF42CA3E096">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9583_5FF42CA3E096" x="593" y="345" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9583_5FF42CA3E096" x="279" y="353" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9583_5FF42CA3E096" x="585" y="299"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9583_5FF42CA3E096" x="585" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9583_5FF42CA3E096" x="271" y="307"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9583_5FF42CA3E096" x="271" y="371"/>
 			</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="709" y="408" width="148" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_9787_DB2496C70148" x="392" y="416" 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="840" y="431" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_9787_DB2496C70148" x="523" y="439" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_9787_DB2496C70148" x="708" y="426"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_9787_DB2496C70148" x="859" y="426"/>
+				<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"/>
 			</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="916" y="407"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_82FA_E8F122CD0638" x="916" y="330"/>
+				<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>
 			<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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_8FFF_C8B67B4CF87D" x="506" y="189" width="130" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_8FFF_C8B67B4CF87D" x="190" y="197" width="130" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_8FFF_C8B67B4CF87D" text="1..*" modelElement="EAID_dst1E7032_36A3_4c8b_8FFF_C8B67B4CF87D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_8FFF_C8B67B4CF87D" x="592" y="169" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_8FFF_C8B67B4CF87D" x="276" y="177" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_8FFF_C8B67B4CF87D" x="580" y="229"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_8FFF_C8B67B4CF87D" x="580" y="164"/>
+				<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="818" y="260"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_918C_44D86E9AC3CF" x="818" y="194"/>
+				<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_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="979" y="409" width="144" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="417" width="144" 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="979" y="432" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_BFCF_A26F9C0B1D38" x="662" y="440" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_BFCF_A26F9C0B1D38" x="1262" y="427"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_BFCF_A26F9C0B1D38" x="976" y="427"/>
+				<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"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_A54F_BC6967C07ADF" x="918" y="226" width="115" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_A54F_BC6967C07ADF" x="601" y="234" width="115" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_A54F_BC6967C07ADF" text="0..1" modelElement="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_A54F_BC6967C07ADF" x="990" y="205" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_A54F_BC6967C07ADF" x="673" y="213" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_A54F_BC6967C07ADF" x="978" y="260"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_A54F_BC6967C07ADF" x="978" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_A54F_BC6967C07ADF" x="661" y="268"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_A54F_BC6967C07ADF" x="661" y="208"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_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_A1B2_4395_B62C_6F674CDB3888" x="1030" y="130"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B62C_6F674CDB3888" x="1030" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_B62C_6F674CDB3888" x="713" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B62C_6F674CDB3888" x="713" y="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_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_A1B2_4395_806C_38F93CA90719" x="916" y="130"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_806C_38F93CA90719" x="916" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_806C_38F93CA90719" x="599" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_806C_38F93CA90719" x="599" y="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_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_A1B2_4395_925D_13E9A7667A18" text="+epo-cat:hasAmount" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_925D_13E9A7667A18" x="1187" y="211" width="85" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_925D_13E9A7667A18" x="870" y="219" width="85" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_925D_13E9A7667A18" x="1246" y="228" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_925D_13E9A7667A18" x="929" y="236" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_925D_13E9A7667A18" x="1068" y="184"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_925D_13E9A7667A18" x="1238" y="184"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A1B2_4395_925D_13E9A7667A18" x="1238" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_925D_13E9A7667A18" x="751" y="192"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_925D_13E9A7667A18" x="921" y="192"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A1B2_4395_925D_13E9A7667A18" x="921" y="254"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1BD1C3F1_A1B2_4395_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_A1B2_4395_91B2_799578663395" text="+epo:isCalculatedOn" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_91B2_799578663395" x="1336" y="208" width="83" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_91B2_799578663395" x="1019" y="216" width="83" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A1B2_4395_91B2_799578663395" text="0..1" modelElement="EAID_dst0D1B16_C07B_4868_91B2_799578663395">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_91B2_799578663395" x="1352" y="228" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_91B2_799578663395" x="1035" y="236" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_91B2_799578663395" x="1068" y="151"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_91B2_799578663395" x="1344" y="151"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A1B2_4395_91B2_799578663395" x="1344" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_91B2_799578663395" x="751" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_91B2_799578663395" x="1027" y="159"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A1B2_4395_91B2_799578663395" x="1027" y="254"/>
 			</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="1236" y="365" width="130" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A1B2_4395_B3EA_A725F5A385F7" x="919" y="373" 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="1321" y="349" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A1B2_4395_B3EA_A725F5A385F7" x="1004" y="357" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A1B2_4395_B3EA_A725F5A385F7" x="1309" y="392"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_B3EA_A725F5A385F7" x="1309" y="344"/>
+				<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"/>
 			</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="1087" y="277" width="85" height="14"/>
+					<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="1166" y="300" width="6" height="14"/>
+					<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="1068" y="295"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A1B2_4395_AAF8_2E19960E553F" x="1174" y="295"/>
+				<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>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2D088990_D595_4836_A937_3D6269B5EEEC" isFrame="false" modelElement="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E">
@@ -3132,56 +3126,55 @@
 				<times created="2022-08-11 09:40:01" modified="2022-08-11 13:00:05"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_640DD6F6_7223_4501_835C_1E24699C7872" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="1" ea_localid="215" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:27:04" modified="2023-07-17 18:27:04" complexity="1" status="Proposed"/>
+			<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_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-03-24 16:42: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="fulfilment"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2023-07-17 18:27:04" modified="2023-07-17 18:27:04"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Dependency xmi:id="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" 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"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A" xmi:type="uml:Enumeration" name="at-voc-new:handling-instruction" scope="public">
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-03-24 16:12: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="diagrams"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
-					<NoteLink xmi:id="EAID_357EE20B_991E_4359_99A9_85E159FD3FDA" start="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" end="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA"/>
+					<Dependency xmi:id="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D" start="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" end="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A"/>
+					<Dependency xmi:id="EAID_7D11F407_8C9D_4214_8774_289769C50390" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_BD416B11_0008_44bb_9E71_11784F0EBACB" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="2" ea_localid="216" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:27:17" modified="2023-07-17 18:27:17" complexity="1" status="Proposed"/>
+			<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_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-03-20 16: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/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="fulfilment"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2023-07-17 18:27:17" modified="2023-07-17 18:27:17"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<links>
+					<Dependency xmi:id="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5"/>
+				</links>
 			</element>
 			<element xmi:idref="EAID_BB1AAA4C_E66B_4fde_A0B6_1A30FC13503B" xmi:type="uml:Class" name="epo-ful:TemperatureSpecification" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2622" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:11:09" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_A3FFD06D_B4CC_4c60_9D01_BAAA3CCE5A27" name="dct:description" scope="Public">
 						<initial/>
@@ -3206,14 +3199,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD" xmi:type="uml:Class" name="epo-ful:AbstractContainer" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2621" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:56:58" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_CA48A297_FEB1_4283_9D35_59D451D012B9" name="epo-ful:isReturnableMaterial" scope="Public">
 						<initial/>
@@ -3260,15 +3253,28 @@
 					<Generalization xmi:id="EAID_61578ED8_0C54_435b_A73F_AD86550D22E1" start="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" end="EAID_C7E49BDC_48E6_4ea0_A3F8_36BB2D57FFCD"/>
 				</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_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-14 14:17: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="fulfilment"/>
+				<links>
+					<Dependency xmi:id="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" xmi:type="uml:Class" name="epo-ful:TransportMeansOperator" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2618" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 15:08:40" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Association xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
 					<Generalization xmi:id="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
@@ -3276,14 +3282,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_C215EC75_82FD_45d3_832A_B3989A897692" xmi:type="uml:Class" name="epo-ful:GoodsItem" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2615" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 12:42:56" modified="2023-03-30 17:10: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<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_AB852C7E_4390_46da_9255_1C4C8BE7B02F" start="EAID_C215EC75_82FD_45d3_832A_B3989A897692" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
@@ -3292,43 +3298,69 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" xmi:type="uml:Class" name="epo-ful:ShipmentAgreement" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2623" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-08 16:33:23" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Association xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8" start="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
 					<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_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
 				</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_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-14 14:17: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="fulfilment"/>
+				<links>
+					<Dependency xmi:id="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_4CD4C360_C8F1_4565_9570_087A142343D6"/>
+				</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_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-14 14:17: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="fulfilment"/>
+				<links>
+					<Dependency xmi:id="EAID_506D198C_F014_4656_84A2_E0CF23F0C305" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9" xmi:type="uml:Class" name="epo-ful:TransportEquipmentSeal" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2610" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-02-03 15:27:42" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<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_BA43B026_B4D0_426b_AB39_1D8D064F10A5" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" xmi:type="uml:Class" name="epo-ful:TransportMeans" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2575" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 17:04:58" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Dependency xmi:id="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668"/>
 					<Dependency xmi:id="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470"/>
@@ -3339,14 +3371,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1AFD08CC_78FD_4b67_BE94_E8962C41C9F6" xmi:type="uml:Class" name="epo-ful:ShipmentStage" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2573" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:51:21" modified="2023-03-20 16:20: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_480BB6B3_EC84_4048_8BB4_14680AEE519E" name="epo-ful:isHazardousRisk" scope="Public">
 						<initial/>
@@ -3376,14 +3408,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" xmi:type="uml:Class" name="epo-ful:Package" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2571" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:33" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_881A49EE_A6E6_40c9_A28F_8220939D14DE" name="epo-ful:hasPackagingTypeDescription" scope="Public">
 						<initial/>
@@ -3411,14 +3443,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" xmi:type="uml:Class" name="epo-ful:TransportEquipment" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2570" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:47:00" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_DC3820D0_EB0A_427c_A17C_65B03FDCF40F" name="epo-ful:isReturnable" scope="Public">
 						<initial/>
@@ -3491,42 +3523,42 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" xmi:type="uml:Class" name="epo-ful:Notifier" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2568" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:28:02" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<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"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" xmi:type="uml:Class" name="epo-ful:FreightForwarder" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2567" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:27:33" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Generalization xmi:id="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" start="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					<Association xmi:id="EAID_4D018782_9090_4ec2_95E6_BC660BB6F161" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" xmi:type="uml:Class" name="epo-ful:Consignment" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2566" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-18 16:25:54" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_0C96E1C5_7220_4034_BC9A_6674B6211C12" name="epo-ful:hasVehicleDescription" scope="Public">
 						<initial/>
@@ -3661,15 +3693,28 @@
 					<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_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" xmi:type="uml:Enumeration" name="at-voc-new:packaging-type" scope="public">
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-14 14:17: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
+				<links>
+					<Dependency xmi:id="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" start="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" end="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A"/>
+				</links>
+			</element>
 			<element xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC" xmi:type="uml:Class" name="epo-ful:DespatchLine" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2117" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:34:41" modified="2022-11-01 15:04: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="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_B772CC17_2873_4964_9C08_D45EC3DCC68F" name="epo-ful:hasOutstandingQuantityReason" scope="Public">
 						<initial/>
@@ -3700,14 +3745,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" xmi:type="uml:Class" name="epo-ful:TransportHandlingUnit" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2025" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:14:08" modified="2023-03-12 13:49: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="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_9415F538_3385_43d5_ACA4_5CECFE7F5116" name="epo-ful:hasShippingMark" scope="Public">
 						<initial/>
@@ -3750,14 +3795,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" xmi:type="uml:Class" name="epo-ful:ShipmentInformation" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2023" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 13:13:06" modified="2023-03-12 13:49: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<attributes>
 					<attribute xmi:idref="EAID_2BA699ED_5F72_4730_9D8B_AE6943FFEA19" name="epo-ful:despatchDate" scope="Public">
 						<initial/>
@@ -3804,14 +3849,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" xmi:type="uml:Class" name="epo-ful:Despatcher" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2017" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:58:54" modified="2023-03-12 13:47:21" 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"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Generalization xmi:id="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" start="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Association xmi:id="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721" start="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
@@ -3821,14 +3866,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" xmi:type="uml:Class" name="epo-ful:DespatchAdvice" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" tpos="0" ea_localid="2116" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:27" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-11-01 14:18:28" modified="2022-11-01 14:18:47" 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"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<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_0A78D73E_7BA7_4bf0_9D36_DD776DFC8538" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
@@ -3844,175 +3889,82 @@
 					<Association xmi:id="EAID_E91C243F_824F_48fd_8601_BEA52AB5E730" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" xmi:type="uml:Class" name="epo-ful:Carrier" scope="public">
-				<model package="EAPK_BD416B11_0008_44bb_9E71_11784F0EBACB" 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="2023-07-17 18:27:27" 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_70DB7081_2834_461e_8B11_0F74ABE52935" start="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<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_E60B4FFC_6069_40c7_9E18_F67462337421" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_E60B4FFC_6069_40c7_9E18_F67462337421" package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="3" ea_localid="217" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:27:35" modified="2023-07-17 18:27: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="fulfilment"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2023-07-17 18:27:35" modified="2023-07-17 18:27:35"/>
-				<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_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" 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_AF8C5388_D443_4b59_918C_44D86E9AC3CF" start="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" end="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5"/>
-				</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_E60B4FFC_6069_40c7_9E18_F67462337421" tpos="0" ea_localid="2789" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:10:24" modified="2023-03-20 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Dependency xmi:id="EAID_6E467C8A_6420_4dec_A268_3FC6AF39C084" start="EAID_05A42455_86E9_49a9_98CF_6753815E5C67" end="EAID_0648E479_6FDB_4549_8A77_989FA3BA7568"/>
 				</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_E60B4FFC_6069_40c7_9E18_F67462337421" tpos="0" ea_localid="2788" ea_eleType="element"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-14 16:04:43" modified="2023-07-17 17:24:33" 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"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
 					<Dependency xmi:id="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_274424DF_415D_400f_99C0_FDA108C74C7A"/>
 				</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_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" xmi:type="uml:Class" name="epo-ful:Carrier" scope="public">
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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="2023-03-12 13:46: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="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
-					<Dependency xmi:id="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D" start="EAID_117266A0_15D9_43ea_A77E_FE330B5E5FDE" end="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A"/>
-					<Dependency xmi:id="EAID_7D11F407_8C9D_4214_8774_289769C50390" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" end="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A"/>
+					<Generalization xmi:id="EAID_70DB7081_2834_461e_8B11_0F74ABE52935" start="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<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="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A" xmi:type="uml:Enumeration" name="at-voc-new:packaging-type" scope="public">
-				<model package="EAPK_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_27ECEEC8_871D_4826_8EA1_8E10F63A1500" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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"/>
+				<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="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="fulfilment"/>
 				<links>
-					<Dependency xmi:id="EAID_169F95CD_4B6A_4e39_994B_4700B802E440" start="EAID_22A0CC26_DD08_4461_AD33_16377B8FE76B" end="EAID_BA97F7F9_0B9C_4d96_8E10_3AC087F5FF2A"/>
+					<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="EAID_4CD4C360_C8F1_4565_9570_087A142343D6" xmi:type="uml:Enumeration" name="at-voc-new:size-type" scope="public">
-				<model package="EAPK_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" package="EAPK_C5E3D6A4_38B2_4388_A589_2A55A094F6B3" tpos="3" ea_localid="204" 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="controlled vocabularies"/>
-				<links>
-					<Dependency xmi:id="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_4CD4C360_C8F1_4565_9570_087A142343D6"/>
-				</links>
+				<extendedProperties tagged="0" package_name="Fulfilment"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</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_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_92B3A0FA_4633_4355_8E1C_C3838E967EEC" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3034" 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:42: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="controlled vocabularies"/>
-				<links>
-					<Dependency xmi:id="EAID_506D198C_F014_4656_84A2_E0CF23F0C305" start="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA" end="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA"/>
-				</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_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" 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_37038B3F_FA49_401f_B4D4_B3EE0610F79E" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668"/>
-				</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_E60B4FFC_6069_40c7_9E18_F67462337421" 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="2023-07-17 18:27:44" 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_507F5BF2_9FDB_496a_84EC_413BB95A2AB6" start="EAID_9E80131F_7D1C_452d_98B2_308983569ECB" end="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470"/>
-				</links>
-			</element>
-			<element xmi:idref="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" xmi:type="uml:Package" name="datatype" scope="public">
-				<model package2="EAID_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" package="EAPK_C5E3D6A4_38B2_4388_A589_2A55A094F6B3" tpos="3" ea_localid="204" 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="Fulfilment"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
-			</element>
-			<element xmi:idref="EAID_92B3A0FA_4633_4355_8E1C_C3838E967EEC" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
-				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3034" 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:42: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"/>
+				<extendedProperties tagged="0" package_name="datatype"/>
 			</element>
 			<element xmi:idref="EAID_167D94D3_A716_4729_B1FB_52750A1E917F" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
 				<model package="EAPK_8A83B550_1EDC_4bf1_BAAD_2C75D3B1878E" tpos="0" ea_localid="3029" ea_eleType="element"/>
@@ -4076,35 +4028,133 @@
 			</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 xmi:idref="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<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_54C25D5B_33E1_4ec5_BCDB_3E876216F668">
+					<model ea_localid="2820" type="Enumeration" name="at-voc-new:transport-means-type"/>
+					<role name="epo-ful:hasTransportMeansType" 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="4326"/>
+				<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:hasTransportMeansType"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D">
+				<source 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="false"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A">
+					<model ea_localid="2819" type="Enumeration" name="at-voc-new:handling-instruction"/>
+					<role name="epo-ful:hasHandlingInstructionCode" 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="4432"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4431"/>
+				<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-ful:hasHandlingInstructionCode"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_7D11F407_8C9D_4214_8774_289769C50390">
+				<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_894938CF_E95C_498c_9C4C_0FD3115E2A2A">
+					<model ea_localid="2819" type="Enumeration" name="at-voc-new:handling-instruction"/>
+					<role name="epo-ful:hasHandlingInstructionCode" 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="4325"/>
+				<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:hasHandlingInstructionCode"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
+				<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;Owned=0;Navigable=Non-Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5">
+					<model ea_localid="2772" type="Enumeration" name="at-voc-new:allowance-charge-reason"/>
+					<role name="epo-ful:hasAllowanceChargeReason" 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="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/"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo-ful:hasAllowanceChargeReason"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -4564,6 +4614,39 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6">
+				<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_41E9A77E_E3B5_48df_BE17_4B4411613470">
+					<model ea_localid="2619" type="Enumeration" name="at-voc-new:transport-mode"/>
+					<role name="epo-ful:hasTransportMode" 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="4030"/>
+				<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-ful:hasTransportMode"/>
+				<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"/>
@@ -4913,9 +4996,9 @@
 				<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_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B">
+				<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/>
@@ -4925,10 +5008,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_4CD4C360_C8F1_4565_9570_087A142343D6">
+					<model ea_localid="2613" type="Enumeration" name="at-voc-new:size-type"/>
+					<role name="epo-ful:hasSizeType" 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;"/>
@@ -4936,19 +5019,17 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4000"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4014"/>
+				<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="+adms:identifier"/>
+				<labels rb="0..*" rt="+epo-ful:hasSizeType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
+			<connector xmi:idref="EAID_506D198C_F014_4656_84A2_E0CF23F0C305">
 				<source xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
 					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -4960,9 +5041,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9">
-					<model ea_localid="2610" type="Class" name="epo-ful:TransportEquipmentSeal"/>
-					<role name="epo-ful:hasTransportEquipmentSeal" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_9DC1B8F7_FF27_4120_A538_C3E64CC643BA">
+					<model ea_localid="2612" type="Enumeration" name="at-voc-new:transport-equipment-type"/>
+					<role name="epo-ful:hasTransportEquipmentType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -4971,21 +5052,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3999"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4013"/>
+				<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-ful:hasTransportEquipmentSeal"/>
+				<labels rb="0..*" rt="+epo-ful:hasTransportEquipmentType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_37038B3F_FA49_401f_B4D4_B3EE0610F79E">
-				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
-					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+			<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/>
@@ -4995,9 +5074,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_54C25D5B_33E1_4ec5_BCDB_3E876216F668">
-					<model ea_localid="2820" type="Enumeration" name="at-voc-new:transport-means-type"/>
-					<role name="epo-ful:hasTransportMeansType" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -5006,19 +5085,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4326"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<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="+epo-ful:hasTransportMeansType"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_507F5BF2_9FDB_496a_84EC_413BB95A2AB6">
-				<source xmi:idref="EAID_9E80131F_7D1C_452d_98B2_308983569ECB">
-					<model ea_localid="2575" type="Class" name="epo-ful:TransportMeans"/>
+			<connector xmi:idref="EAID_BA43B026_B4D0_426b_AB39_1D8D064F10A5">
+				<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/>
@@ -5028,10 +5109,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_41E9A77E_E3B5_48df_BE17_4B4411613470">
-					<model ea_localid="2619" type="Enumeration" name="at-voc-new:transport-mode"/>
-					<role name="epo-ful:hasTransportMode" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3C8EEF69_1346_4dbe_B505_7C2D920B97B9">
+					<model ea_localid="2610" type="Class" name="epo-ful:TransportEquipmentSeal"/>
+					<role name="epo-ful:hasTransportEquipmentSeal" 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;"/>
@@ -5039,11 +5120,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4030"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="3999"/>
+				<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-ful:hasTransportMode"/>
+				<labels rb="0..*" rt="+epo-ful:hasTransportEquipmentSeal"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -5501,39 +5584,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_506D198C_F014_4656_84A2_E0CF23F0C305">
-				<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_9DC1B8F7_FF27_4120_A538_C3E64CC643BA">
-					<model ea_localid="2612" type="Enumeration" name="at-voc-new:transport-equipment-type"/>
-					<role name="epo-ful:hasTransportEquipmentType" 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="4013"/>
-				<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-ful:hasTransportEquipmentType"/>
-				<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"/>
@@ -5569,34 +5619,35 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CEFBB7DC_83F7_430a_B9C9_3A70FB20574B">
-				<source xmi:idref="EAID_D1A4B312_C1B2_4469_AA1D_07C668B580AA">
-					<model ea_localid="2570" type="Class" name="epo-ful:TransportEquipment"/>
+			<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;Owned=0;Navigable=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4CD4C360_C8F1_4565_9570_087A142343D6">
-					<model ea_localid="2613" type="Enumeration" name="at-voc-new:size-type"/>
-					<role name="epo-ful:hasSizeType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4014"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<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 rb="0..*" rt="+epo-ful:hasSizeType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -6090,39 +6141,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7D11F407_8C9D_4214_8774_289769C50390">
-				<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_894938CF_E95C_498c_9C4C_0FD3115E2A2A">
-					<model ea_localid="2819" type="Enumeration" name="at-voc-new:handling-instruction"/>
-					<role name="epo-ful:hasHandlingInstructionCode" 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="4325"/>
-				<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: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"/>
@@ -6717,39 +6735,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_27E9E48A_CCBA_48c3_A27B_53F4397FF22D">
-				<source 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="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_894938CF_E95C_498c_9C4C_0FD3115E2A2A">
-					<model ea_localid="2819" type="Enumeration" name="at-voc-new:handling-instruction"/>
-					<role name="epo-ful:hasHandlingInstructionCode" 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="4431"/>
-				<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:hasHandlingInstructionCode"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_9D8A2FCD_752D_45a9_9023_77697592FF3C">
 				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
 					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
@@ -7373,43 +7358,9 @@
 				<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"/>
-					<role visibility="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="3357"/>
-				<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_AF8C5388_D443_4b59_918C_44D86E9AC3CF">
-				<source xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1">
-					<model ea_localid="2041" type="Class" name="epo-ord:AllowanceChargeInformation"/>
+			<connector xmi:idref="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8">
+				<source 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/>
@@ -7419,9 +7370,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5">
-					<model ea_localid="2772" type="Enumeration" name="at-voc-new:allowance-charge-reason"/>
-					<role name="epo-ful:hasAllowanceChargeReason" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_274424DF_415D_400f_99C0_FDA108C74C7A">
+					<model ea_localid="2788" type="Enumeration" name="at-voc-new:document-status"/>
+					<role name="epo:hasDocumentStatus" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7430,44 +7381,45 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4244"/>
+				<model ea_localid="4271"/>
 				<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="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DocumentStatusCode/"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasAllowanceChargeReason"/>
+				<labels rb="0..1" rt="+epo:hasDocumentStatus"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_2B89940C_0005_4c86_BE14_3F84B34FF9D8">
-				<source xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_274424DF_415D_400f_99C0_FDA108C74C7A">
-					<model ea_localid="2788" type="Enumeration" name="at-voc-new:document-status"/>
-					<role name="epo:hasDocumentStatus" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4271"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="https://test-docs.peppol.eu/logistics/transport-execution/codelist/DocumentStatusCode/"/>
+				<model ea_localid="3357"/>
+				<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:hasDocumentStatus"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7486,7 +7438,7 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_85FB2EE8_AEBD_45d4_92DD_8FC795FDE413">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="399" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="2"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="399" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="2"/>
 				<properties name="despatch advice line" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-01-18 14:49:25" modified="2023-06-01 20:56: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;"/>
@@ -7538,7 +7490,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_2B157CDB_0A9A_43f4_BB8C_F112D7DC954A">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="400" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="1"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="400" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="1"/>
 				<properties name="despatch advice advanced" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-01-18 15:32:02" modified="2023-07-17 17:32: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;"/>
@@ -7658,7 +7610,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_D210A255_85F8_4c7e_8376_ED3954C42486">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="406" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="5"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="406" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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"/>
 				<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;"/>
@@ -7702,7 +7654,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_EC284203_FAC5_4d56_86F8_EC99545F97B4">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="407" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="6"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="407" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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"/>
 				<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;"/>
@@ -7741,7 +7693,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_0E0367BE_EF6C_459c_9C87_3B64208EE574">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="408" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="4"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="408" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" tpos="4"/>
 				<properties name="abstract container" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-02-08 15:56:53" modified="2023-06-01 21:04: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;"/>
@@ -7793,7 +7745,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_9F7EC64C_05DC_429f_B68B_6CE04C3F8991">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="421" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="7"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="421" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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"/>
 				<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;"/>
@@ -7830,32 +7782,32 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_1BD1C3F1_A1B2_4395_9499_3C88CA228A42">
-				<model package="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" localID="444" owner="EAPK_640DD6F6_7223_4501_835C_1E24699C7872" tpos="3"/>
+				<model package="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" localID="444" owner="EAPK_F06D2F7A_E721_4546_8DB4_E394E261653D" 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-06-01 21:02:21"/>
+				<project author="andreea" version="1.0" created="2023-04-24 11:04:32" modified="2023-09-11 18:15: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=C0027303;"/>
+				<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;"/>
 				<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=873;Top=30;Right=963;Bottom=90;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="1" style="DUID=8825FB8E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=979;Top=30;Right=1069;Bottom=90;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="2" style="DUID=3495A676;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1262;Top=392;Right=1352;Bottom=462;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="3" style="DUID=8D0EC452;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=768;Top=134;Right=858;Bottom=194;" subject="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" seqno="4" style="DUID=46C2772C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1174;Top=246;Right=1441;Bottom=344;" 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=873;Top=130;Right=1068;Bottom=200;" 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=768;Top=260;Right=1068;Bottom=330;" 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=859;Top=407;Right=976;Bottom=448;" 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=453;Top=363;Right=708;Bottom=490;" subject="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" seqno="9" style="DUID=AA79A031;NSL=0;"/>
-					<element geometry="Left=445;Top=94;Right=716;Bottom=164;" 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=524;Top=229;Right=639;Bottom=299;" 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="Left=556;Top=38;Right=646;Bottom=98;" subject="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" seqno="1" style="DUID=8825FB8E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=662;Top=38;Right=752;Bottom=98;" subject="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" seqno="2" style="DUID=3495A676;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=945;Top=400;Right=1035;Bottom=470;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="3" style="DUID=8D0EC452;NSL=0;BCol=-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=142;Right=541;Bottom=202;" subject="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" seqno="4" style="DUID=46C2772C;NSL=0;BCol=-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=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=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=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="SX=0;SY=-45;EX=-121;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1186:-471$;" subject="EAID_2E9FE66A_E025_4563_9A59_461990838D96" style="Mode=3;EOID=07C505DB;SOID=AA79A031;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<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="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;"/>
@@ -7863,8 +7815,8 @@
 					<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=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=1238:-184$;" 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=1344:-151$;" subject="EAID_470D1B16_C07B_4868_91B2_799578663395" style="Mode=3;EOID=07C505DB;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;"/>
 				</elements>
diff --git a/implementation/eNotice/xmi_conceptual_model/eNotice_CM.xml b/implementation/eNotice/xmi_conceptual_model/eNotice_CM.xml
index 97d123d1..7e055246 100644
--- a/implementation/eNotice/xmi_conceptual_model/eNotice_CM.xml
+++ b/implementation/eNotice/xmi_conceptual_model/eNotice_CM.xml
@@ -13,9 +13,6 @@
 				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" body="Planning&#xA;Competition&#xA;DAP&#xA;Result&#xA;Contract modification">
 					<annotatedElement xmi:idref="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
 				</ownedComment>
-				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_7EC69E83_5203_42b9_817F_943268EF9139" body="This relation is used in std form mappings. Do we want to keep it at the Notice level, or use a more granular level (type of Notice)?">
-					<annotatedElement xmi:idref="EAID_F955E894_651A_4a8b_A411_E8DA312BC449"/>
-				</ownedComment>
 				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" body="When backwards compatibility to StandardForms is no longer required, switch to establishing the notice type constraint at this level.">
 					<annotatedElement xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
 				</ownedComment>
@@ -1270,6 +1267,15 @@
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_4BD860EF_5AF8_4fb4_B0D2_5C7B95031994" name="epo-not:StandardForm"/>
 				</packagedElement>
 			</packagedElement>
+			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" name="datatype">
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_F87884C5_7DFD_4c88_8D18_876163190DD5" name="rdf:PlainLiteral"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_AEA6D0EB_ACE7_45df_A9CA_5574C2E5283C" name="xsd:anyURI"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_48067922_1CD8_4de9_9AC1_50EE42B5BBB1" name="xsd:boolean"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_4DBFF821_E794_4c04_B8A8_D51DC8006B20" name="xsd:date"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_8AA9E691_DDD7_44ec_9672_431FB80591B6" name="xsd:dateTime"/>
+				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_A3AC489F_C4B5_4abe_A0DB_30E66759C38D" name="xsd:decimal"/>
+				<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_BD23B8EE_A621_4d1e_A562_7BA554221AA8">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
@@ -1291,9 +1297,6 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_98DE_4cc5_B921_97A716439257" text="epo-not:ContractModificationNotice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_B921_97A716439257" x="1318" y="601" width="171" height="44"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_6785F76B_98DE_4cc5_AA2B_BE7308712695" modelElement="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_AA2B_BE7308712695" x="326" y="724" width="215" height="68"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_AB49_BF3DDBFF4E66" modelElement="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_98DE_4cc5_AB49_BF3DDBFF4E66" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_98DE_4cc5_AB49_BF3DDBFF4E66" text="at-voc:legal-basis"/>
@@ -1308,7 +1311,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_98DE_4cc5_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_B217_37E957B3B448" x="820" y="107" width="187" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_98DE_4cc5_B217_37E957B3B448" x="820" y="107" width="195" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6785F76B_98DE_4cc5_A283_99A69DAB2E4A" modelElement="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_98DE_4cc5_A283_99A69DAB2E4A" text="enumeration"/>
@@ -1348,10 +1351,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_A025_488C1781D353" x="845" y="601"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_A025_488C1781D353" x="845" y="564"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_8FA6_A01D070F8819" source="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" target="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" modelElement="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_8FA6_A01D070F8819" x="953" y="386"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_8FA6_A01D070F8819" x="985" y="305"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_BD29_58E4B7187783" source="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" target="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" modelElement="EAID_36806876_C16C_4dc1_BD29_58E4B7187783">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_BD29_58E4B7187783" x="1454" y="430"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_BD29_58E4B7187783" x="1252" y="430"/>
@@ -1372,7 +1371,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_98DE_4cc5_99CE_63F041A42F06" text="0..*" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_98DE_4cc5_99CE_63F041A42F06" x="1219" y="160" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_99CE_63F041A42F06" x="1007" y="155"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_99CE_63F041A42F06" x="1015" y="155"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_99CE_63F041A42F06" x="1238" y="155"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_B93C_EED975A6974F" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F">
@@ -1382,7 +1381,7 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_98DE_4cc5_B93C_EED975A6974F" text="0..1" modelElement="EAID_dstEBAC59_19C6_4908_B93C_EED975A6974F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_98DE_4cc5_B93C_EED975A6974F" x="1219" y="210" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_B93C_EED975A6974F" x="1007" y="205"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_B93C_EED975A6974F" x="1015" y="205"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_B93C_EED975A6974F" x="1238" y="205"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_B8FF_34E21440DAD9" source="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
@@ -1402,18 +1401,18 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_98DE_4cc5_8018_10297955785C" x="1013" y="251" width="87" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_98DE_4cc5_8018_10297955785C" x="1021" y="251" width="87" height="27"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_98DE_4cc5_8018_10297955785C" text="0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_98DE_4cc5_8018_10297955785C" x="1010" y="242" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_98DE_4cc5_8018_10297955785C" x="1018" y="242" width="100" height="10"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_8018_10297955785C" x="943" y="270"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_8018_10297955785C" x="943" y="270"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_8018_10297955785C" x="943" y="305"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_98DE_4cc5_8018_10297955785C" x="1028" y="305"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_98DE_4cc5_8018_10297955785C" x="1028" y="237"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_98DE_4cc5_8018_10297955785C" x="1007" y="237"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_98DE_4cc5_8018_10297955785C" x="1007" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_98DE_4cc5_8018_10297955785C" x="1015" y="237"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_98DE_4cc5_8018_10297955785C" x="1015" y="237"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
@@ -1422,27 +1421,26 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_98DE_4cc5_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_98DE_4cc5_B72E_BC6C99FF3009" x="995" y="102" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_B72E_BC6C99FF3009" x="1007" y="124"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_B72E_BC6C99FF3009" x="1007" y="124"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_B72E_BC6C99FF3009" x="1015" y="124"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_B72E_BC6C99FF3009" x="1015" y="124"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_B72E_BC6C99FF3009" x="1020" y="124"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_98DE_4cc5_B72E_BC6C99FF3009" x="1020" y="87"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_98DE_4cc5_B72E_BC6C99FF3009" x="987" y="87"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_98DE_4cc5_B72E_BC6C99FF3009" x="987" y="107"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_98DE_4cc5_B72E_BC6C99FF3009" x="987" y="107"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_84D3_E0EDCB7DC006" x="437" y="724"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_84D3_E0EDCB7DC006" x="437" y="645"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_8FA6_A01D070F8819" source="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" target="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" modelElement="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_8FA6_A01D070F8819" x="953" y="386"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_8FA6_A01D070F8819" x="985" y="305"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_A453_938579C970A7" source="EAID_17662AEF_1321_446a_AE42_0583F7417A79" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_AD106A36_48F1_47c9_A453_938579C970A7">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_A453_938579C970A7" x="631" y="601"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_A453_938579C970A7" x="631" y="527"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_A453_938579C970A7" x="799" y="527"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_8AD5_971C71230DCF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_8AD5_971C71230DCF" x="801" y="424"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_8AD5_971C71230DCF" x="801" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_8AD5_971C71230DCF" x="723" y="370"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_94A0_32241C0F50CE" x="856" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_94A0_32241C0F50CE" x="856" y="270"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_8392_5BAE0E90B288" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_98DE_4cc5_8392_5BAE0E90B288" x="984" y="601"/>
@@ -1492,10 +1490,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_BD98_F885B35FD24B" x="1009" y="337"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_98DE_4cc5_BD98_F885B35FD24B" x="1137" y="337"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_94A0_32241C0F50CE" x="855" y="424"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_94A0_32241C0F50CE" x="855" y="270"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6785F76B_98DE_4cc5_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_98DE_4cc5_A2F1_707153826314" x="437" y="601"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_98DE_4cc5_A2F1_707153826314" x="437" y="494"/>
@@ -1513,14 +1507,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DA3F165E_E1C4_443d_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E1C4_443d_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_A12E_00C2BE16F4B6" x="45" y="263" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_A12E_00C2BE16F4B6" x="128" y="263" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_DA3F165E_E1C4_443d_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E1C4_443d_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
 				<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="103"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1C4_443d_AA2B_BE7308712695" x="434" y="395" 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"/>
@@ -1574,8 +1568,8 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E1C4_443d_91FB_B8F7B19FEB4B" text="0..*" modelElement="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E1C4_443d_91FB_B8F7B19FEB4B" x="747" y="523" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1C4_443d_91FB_B8F7B19FEB4B" x="140" y="333"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_91FB_B8F7B19FEB4B" x="140" y="518"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1C4_443d_91FB_B8F7B19FEB4B" x="223" y="333"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_91FB_B8F7B19FEB4B" x="223" y="518"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1C4_443d_91FB_B8F7B19FEB4B" x="766" y="518"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DA3F165E_E1C4_443d_A2F1_707153826314" source="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314">
@@ -1594,13 +1588,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DA3F165E_E1C4_443d_AD89_A9564A5F5F61" source="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_E1C4_443d_AD89_A9564A5F5F61" text="+epo:announcesRole" modelElement="EAID_dst22E99F_335A_40fc_AD89_A9564A5F5F61">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E1C4_443d_AD89_A9564A5F5F61" x="219" y="280" width="84" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E1C4_443d_AD89_A9564A5F5F61" x="302" y="280" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E1C4_443d_AD89_A9564A5F5F61" text="1..*" modelElement="EAID_dst22E99F_335A_40fc_AD89_A9564A5F5F61">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E1C4_443d_AD89_A9564A5F5F61" x="217" y="307" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E1C4_443d_AD89_A9564A5F5F61" x="300" y="307" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1C4_443d_AD89_A9564A5F5F61" x="406" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_AD89_A9564A5F5F61" x="216" y="298"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1C4_443d_AD89_A9564A5F5F61" x="299" y="298"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_DA3F165E_E1C4_443d_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_E1C4_443d_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
@@ -1656,15 +1650,12 @@
 			</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="877" y="550" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_BF42_2A6E50CAF4E6" x="836" y="551" width="171" 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_817F_943268EF9139" modelElement="EAID_7EC69E83_5203_42b9_817F_943268EF9139">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_3421_4d83_817F_943268EF9139" x="1154" y="32" width="115" height="97"/>
-			</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"/>
@@ -1682,7 +1673,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="550"/>
+				<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_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">
@@ -1724,14 +1715,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_A44A_1D010626BE9B" source="EAID_17662AEF_1321_446a_AE42_0583F7417A79" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_3421_4d83_A44A_1D010626BE9B" text="+epo:announcesLotGroup" modelElement="EAID_dst6CC936_0C78_48b9_A44A_1D010626BE9B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3421_4d83_A44A_1D010626BE9B" x="772" y="566" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_3421_4d83_A44A_1D010626BE9B" x="731" y="567" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_3421_4d83_A44A_1D010626BE9B" text="0..*" modelElement="EAID_dst6CC936_0C78_48b9_A44A_1D010626BE9B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3421_4d83_A44A_1D010626BE9B" x="858" y="589" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_3421_4d83_A44A_1D010626BE9B" x="817" y="590" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_A44A_1D010626BE9B" x="520" y="323"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_A44A_1D010626BE9B" x="520" y="584"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3421_4d83_A44A_1D010626BE9B" x="877" y="584"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_3421_4d83_A44A_1D010626BE9B" x="520" y="585"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_3421_4d83_A44A_1D010626BE9B" x="836" y="585"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B3CE5A4A_3421_4d83_A453_938579C970A7" source="EAID_17662AEF_1321_446a_AE42_0583F7417A79" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_AD106A36_48F1_47c9_A453_938579C970A7">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_3421_4d83_A453_938579C970A7" x="520" y="253"/>
@@ -1788,11 +1779,11 @@
 			</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="917" y="483" width="90" height="41"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_BF42_2A6E50CAF4E6" x="878" y="483" width="171" height="62"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_80CC_7E68CBDEDED2" x="902" y="574" width="120" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_06F2_4b3b_80CC_7E68CBDEDED2" x="886" y="585" width="156" height="34"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9E08D249_06F2_4b3b_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_06F2_4b3b_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
@@ -1903,14 +1894,14 @@
 			</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="697" y="589" width="176" height="14"/>
+					<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="883" y="614" width="17" height="14"/>
+					<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="609"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_86FF_2CE55FF62AB6" x="902" y="609"/>
+				<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">
@@ -1936,14 +1927,14 @@
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_8826_322D82AB6DB0" x="822" y="483" width="93" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_8826_322D82AB6DB0" x="783" y="491" width="93" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_06F2_4b3b_8826_322D82AB6DB0" text="0..*" modelElement="EAID_dstCB407C_08A7_467b_8826_322D82AB6DB0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_8826_322D82AB6DB0" x="898" y="506" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_8826_322D82AB6DB0" x="859" y="514" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_8826_322D82AB6DB0" x="534" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8826_322D82AB6DB0" x="534" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8826_322D82AB6DB0" x="917" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_8826_322D82AB6DB0" x="534" y="509"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_06F2_4b3b_8826_322D82AB6DB0" x="878" y="509"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_9E08D249_06F2_4b3b_8392_5BAE0E90B288" source="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_8392_5BAE0E90B288" x="428" y="243"/>
@@ -1967,18 +1958,18 @@
 				<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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_BFE6_593632EDB11F" x="961" y="483"/>
+				<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"/>
 			</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="906" y="548" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_06F2_4b3b_93CA_CC7ACC63568D" x="913" y="565" 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="974" y="529" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_06F2_4b3b_93CA_CC7ACC63568D" x="975" y="550" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_06F2_4b3b_93CA_CC7ACC63568D" x="962" y="574"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_06F2_4b3b_93CA_CC7ACC63568D" x="962" y="524"/>
+				<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"/>
 			</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">
@@ -2025,11 +2016,11 @@
 			</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="873" y="579" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_BF42_2A6E50CAF4E6" x="833" y="572" width="171" 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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_80CC_7E68CBDEDED2" x="670" y="659" width="120" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_37E3_455d_80CC_7E68CBDEDED2" x="670" y="659" width="126" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_FC576D8E_37E3_455d_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_37E3_455d_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
@@ -2055,15 +2046,15 @@
 				<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_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:describesResultNotice" modelElement="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_82CF_5486AAD496C1" x="311" y="347" width="110" height="14"/>
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_82CF_5486AAD496C1" text="+epo:describesDirectAwardPrenotificationNotice" modelElement="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_82CF_5486AAD496C1" x="393" y="339" width="14" height="192"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_82CF_5486AAD496C1" text="0..1" modelElement="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_82CF_5486AAD496C1" x="392" y="327" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_82CF_5486AAD496C1" x="366" y="323" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_82CF_5486AAD496C1" x="179" y="481"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_82CF_5486AAD496C1" x="380" y="481"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_82CF_5486AAD496C1" x="380" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_82CF_5486AAD496C1" x="392" y="481"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_82CF_5486AAD496C1" x="392" y="322"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_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_37E3_455d_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -2128,14 +2119,14 @@
 			</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="753" y="615" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_93CA_CC7ACC63568D" x="713" y="608" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_93CA_CC7ACC63568D" x="865" y="639" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_93CA_CC7ACC63568D" x="825" y="632" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_93CA_CC7ACC63568D" x="735" y="659"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_93CA_CC7ACC63568D" x="735" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_93CA_CC7ACC63568D" x="873" y="634"/>
+				<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"/>
@@ -2149,19 +2140,19 @@
 				<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>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_BFE6_593632EDB11F" x="918" y="579"/>
+				<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"/>
 			</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="768" y="577" width="103" height="14"/>
+					<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="854" y="600" width="17" height="14"/>
+					<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="595"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_37E3_455d_9959_5EE6A49DDD1B" x="873" y="595"/>
+				<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_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">
@@ -2176,13 +2167,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_82B0_7ED4BAC17D43" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_82B0_7ED4BAC17D43" text="+epo:announcesContract" modelElement="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_82B0_7ED4BAC17D43" x="361" y="647" width="100" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_37E3_455d_82B0_7ED4BAC17D43" x="354" y="647" width="100" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_37E3_455d_82B0_7ED4BAC17D43" text="0..*" modelElement="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_82B0_7ED4BAC17D43" x="445" y="674" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_37E3_455d_82B0_7ED4BAC17D43" x="438" y="674" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_82B0_7ED4BAC17D43" x="437" y="322"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_82B0_7ED4BAC17D43" x="437" y="692"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_37E3_455d_82B0_7ED4BAC17D43" x="430" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_37E3_455d_82B0_7ED4BAC17D43" x="430" y="692"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_FC576D8E_37E3_455d_988A_2D1D02E4692C" source="EAID_D847D616_70DB_473a_A2A4_6665F938474C" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_37E3_455d_988A_2D1D02E4692C" text="+epo:announcesRole" modelElement="EAID_dst0AED44_E69C_416d_988A_2D1D02E4692C">
@@ -2229,284 +2220,306 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2A14808D_69AA_430c_86C2_CDA04BE8C4F4" isFrame="false" modelElement="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8">
 			<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="470" y="501" width="245" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_B8A4_6F969F59938C" x="382" y="175" width="245" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_B921_97A716439257" modelElement="EAID_71373AFD_6871_4946_B921_97A716439257">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_B921_97A716439257" text="epo-not:ContractModificationNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_B921_97A716439257" x="786" y="734" width="171" height="44"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_B921_97A716439257" x="698" y="408" width="171" height="44"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_A12E_00C2BE16F4B6" x="507" y="721" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_A12E_00C2BE16F4B6" x="419" y="395" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_8372_75A07B6AB066" x="764" y="1044" width="216" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_8372_75A07B6AB066" x="676" y="718" width="216" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_AC62_FA4769B4D88C" x="1253" y="721" width="99" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_AC62_FA4769B4D88C" x="1165" y="395" width="99" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_80B0_0C345D6703F4" x="1163" y="544" width="278" height="111"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_80B0_0C345D6703F4" x="1075" y="218" width="278" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_BF42_2A6E50CAF4E6" x="1258" y="867" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_BF42_2A6E50CAF4E6" x="1129" y="547" width="171" height="83"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_80CC_7E68CBDEDED2" x="1060" y="964" width="152" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_80CC_7E68CBDEDED2" x="977" y="648" width="152" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_94AC_B4EC57A6B248" x="462" y="860" width="158" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_94AC_B4EC57A6B248" x="374" y="518" width="158" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_8AC2_D7789CCFB7F8" modelElement="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_8AC2_D7789CCFB7F8" text="epo:AwardDecision"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_8AC2_D7789CCFB7F8" x="1165" y="451" width="273" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_8AC2_D7789CCFB7F8" x="1077" y="125" width="273" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_94EE_8405EFE534AF" modelElement="EAID_C39641DF_A778_418a_94EE_8405EFE534AF">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_69AA_430c_94EE_8405EFE534AF" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_94EE_8405EFE534AF" text="at-voc:modification-justification"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_94EE_8405EFE534AF" x="271" y="1266" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_94EE_8405EFE534AF" x="183" y="940" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_9F7F_F93BA82536E7" modelElement="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_9F7F_F93BA82536E7" text="epo-con:ContractModificationInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_9F7F_F93BA82536E7" x="182" y="1158" width="268" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_9F7F_F93BA82536E7" x="94" y="832" width="268" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_69AA_430c_AD7B_7484B8FDA398" text="adms:Identifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_AD7B_7484B8FDA398" x="212" y="1000" width="207" height="88"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_69AA_430c_AD7B_7484B8FDA398" x="124" y="674" width="207" height="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2A14808D_69AA_430c_8F05_5126320D2A7F" modelElement="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
 				<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="507" y="1060" width="133" height="53"/>
+				<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="681" y="738" width="84" height="14"/>
+					<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_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="681" y="761" width="17" height="14"/>
+					<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_9536_906052B9AABC" x="786" y="756"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9536_906052B9AABC" x="678" y="756"/>
+				<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_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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8461_8385AB23B103" x="432" y="1118" width="168" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8461_8385AB23B103" x="429" y="821" width="142" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_8461_8385AB23B103" text="1" modelElement="EAID_dst5EFF4E_D969_4688_8461_8385AB23B103">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8461_8385AB23B103" x="593" y="1118" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8461_8385AB23B103" x="505" y="792" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8461_8385AB23B103" x="450" y="1186"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8461_8385AB23B103" x="581" y="1186"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8461_8385AB23B103" x="581" y="1113"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8461_8385AB23B103" x="362" y="860"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8461_8385AB23B103" x="493" y="860"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8461_8385AB23B103" x="493" y="787"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_BA75_DE0B948A3FD5" source="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" target="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" modelElement="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BA75_DE0B948A3FD5" x="320" y="1228"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BA75_DE0B948A3FD5" x="320" y="1266"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BA75_DE0B948A3FD5" x="232" y="902"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BA75_DE0B948A3FD5" x="232" y="940"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_876B_BEE9D986B4DA" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_876B_BEE9D986B4DA" text="+epo:amendsContract" modelElement="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_876B_BEE9D986B4DA" x="659" y="1083" width="89" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_876B_BEE9D986B4DA" x="571" y="757" width="89" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_876B_BEE9D986B4DA" text="1" modelElement="EAID_dst9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_876B_BEE9D986B4DA" x="756" y="1104" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_876B_BEE9D986B4DA" x="668" y="778" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_876B_BEE9D986B4DA" x="640" y="1099"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_876B_BEE9D986B4DA" x="764" y="1099"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_876B_BEE9D986B4DA" x="552" y="773"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_876B_BEE9D986B4DA" x="676" y="773"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_801D_DFF3EA946B55" source="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_7787587B_6BE4_4863_801D_DFF3EA946B55">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_801D_DFF3EA946B55" x="640" y="1073"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_801D_DFF3EA946B55" x="764" y="1073"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_801D_DFF3EA946B55" x="552" y="747"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_801D_DFF3EA946B55" x="676" y="747"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B3C3_6654ABB348DF" x="1372" y="726" width="69" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B3C3_6654ABB348DF" x="1284" y="400" width="69" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_B3C3_6654ABB348DF" text="1..*" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B3C3_6654ABB348DF" x="1355" y="746" width="17" height="14"/>
+					<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="675" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B3C3_6654ABB348DF" x="675" y="435"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_B3C3_6654ABB348DF" x="1549" y="435"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_B3C3_6654ABB348DF" x="1549" y="741"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_B3C3_6654ABB348DF" x="1352" y="741"/>
+				<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_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>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_BE52_91F3F7270840" text="+epo:refersToNotice 0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BE52_91F3F7270840" x="565" y="444" width="100" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BE52_91F3F7270840" x="477" y="118" width="100" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_BE52_91F3F7270840" text="0..1" modelElement="EAID_dstE70932_F57C_4861_BE52_91F3F7270840">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BE52_91F3F7270840" x="595" y="496" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BE52_91F3F7270840" x="507" y="170" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BE52_91F3F7270840" x="661" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BE52_91F3F7270840" x="661" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_BE52_91F3F7270840" x="661" y="463"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_BE52_91F3F7270840" x="587" y="463"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_BE52_91F3F7270840" x="587" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_69AA_430c_BE52_91F3F7270840" x="587" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BE52_91F3F7270840" x="573" y="175"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BE52_91F3F7270840" x="573" y="175"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_BE52_91F3F7270840" x="573" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_BE52_91F3F7270840" x="499" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_BE52_91F3F7270840" x="499" y="175"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_69AA_430c_BE52_91F3F7270840" x="499" y="175"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_A411_E8DA312BC449" text="+epo:refersToProcedure" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_A411_E8DA312BC449" x="1444" y="554" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_A411_E8DA312BC449" x="1356" y="228" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_A411_E8DA312BC449" text="1" modelElement="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_A411_E8DA312BC449" x="1444" y="577" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_A411_E8DA312BC449" x="1356" y="251" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_A411_E8DA312BC449" x="696" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_A411_E8DA312BC449" x="696" y="444"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_A411_E8DA312BC449" x="1493" y="444"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_A411_E8DA312BC449" x="1493" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_A411_E8DA312BC449" x="1441" y="572"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_A411_E8DA312BC449" x="608" y="175"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_A411_E8DA312BC449" x="608" y="118"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_A411_E8DA312BC449" x="1405" y="118"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_A411_E8DA312BC449" x="1405" y="246"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_69AA_430c_A411_E8DA312BC449" x="1353" y="246"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_9E46_695F79EE21E5" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_9E46_695F79EE21E5" text="+epo:refersToContractToBeModified" modelElement="EAID_dstEB6ABB_DB35_4b96_9E46_695F79EE21E5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9E46_695F79EE21E5" x="785" y="1007" width="146" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9E46_695F79EE21E5" x="678" y="685" width="146" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_9E46_695F79EE21E5" text="1" modelElement="EAID_dstEB6ABB_DB35_4b96_9E46_695F79EE21E5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9E46_695F79EE21E5" x="864" y="1026" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9E46_695F79EE21E5" x="764" y="700" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9E46_695F79EE21E5" x="856" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9E46_695F79EE21E5" x="856" y="1044"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9E46_695F79EE21E5" x="756" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9E46_695F79EE21E5" x="756" y="718"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_B079_4FE5372221E4" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" modelElement="EAID_F4410E27_20ED_475c_B079_4FE5372221E4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_B079_4FE5372221E4" text="+epo:announcesContractAmendment" modelElement="EAID_dst410E27_20ED_475c_B079_4FE5372221E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B079_4FE5372221E4" x="498" y="1022" width="150" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B079_4FE5372221E4" x="410" y="696" width="150" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_B079_4FE5372221E4" text="1" modelElement="EAID_dst410E27_20ED_475c_B079_4FE5372221E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B079_4FE5372221E4" x="581" y="1042" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B079_4FE5372221E4" x="493" y="716" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_B079_4FE5372221E4" x="829" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B079_4FE5372221E4" x="829" y="973"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_B079_4FE5372221E4" x="573" y="973"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_B079_4FE5372221E4" x="573" y="1060"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_B079_4FE5372221E4" x="741" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B079_4FE5372221E4" x="741" y="647"/>
+				<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_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="240" y="1115" width="148" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_B319_1174DD83D564" x="152" y="789" width="152" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_B319_1174DD83D564" text="0..1" modelElement="EAID_dst4EE008_B895_41f1_B319_1174DD83D564">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B319_1174DD83D564" x="327" y="1093" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_B319_1174DD83D564" x="239" y="767" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_B319_1174DD83D564" x="315" y="1158"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_B319_1174DD83D564" x="315" y="1088"/>
+				<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="798" y="734"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8080_CCC8C1824CB7" x="798" y="625"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8080_CCC8C1824CB7" x="715" y="625"/>
+				<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="1251" y="959" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_93CA_CC7ACC63568D" x="1167" y="652" width="97" 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="1315" y="942" width="6" height="14"/>
+					<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="1212" y="990"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_93CA_CC7ACC63568D" x="1303" y="990"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_93CA_CC7ACC63568D" x="1303" y="937"/>
+				<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_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="623" y="881" width="155" height="14"/>
+					<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="623" y="904" width="17" height="14"/>
+					<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="793" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BDF4_F589B6CAC7A1" x="793" y="899"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_BDF4_F589B6CAC7A1" x="620" y="899"/>
+				<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_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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8C96_D5EA3AE635E9" x="1163" y="879" width="93" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8C96_D5EA3AE635E9" x="1034" y="563" width="93" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_8C96_D5EA3AE635E9" text="0..*" modelElement="EAID_dstDACA2B_8A10_4516_8C96_D5EA3AE635E9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8C96_D5EA3AE635E9" x="1239" y="902" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8C96_D5EA3AE635E9" x="1110" y="586" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8C96_D5EA3AE635E9" x="942" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8C96_D5EA3AE635E9" x="942" y="897"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8C96_D5EA3AE635E9" x="1258" y="897"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8C96_D5EA3AE635E9" x="854" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8C96_D5EA3AE635E9" x="854" y="581"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8C96_D5EA3AE635E9" x="1129" y="581"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_9501_AB53057BAF53" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" modelElement="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_9501_AB53057BAF53" text="+epo:refersToLotGroupAwardInformation" modelElement="EAID_dstEB9836_FFEC_4652_9501_AB53057BAF53">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9501_AB53057BAF53" x="892" y="979" width="166" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9501_AB53057BAF53" x="809" y="663" width="166" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_9501_AB53057BAF53" text="0..*" modelElement="EAID_dstEB9836_FFEC_4652_9501_AB53057BAF53">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9501_AB53057BAF53" x="1041" y="1002" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9501_AB53057BAF53" x="958" y="686" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9501_AB53057BAF53" x="891" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9501_AB53057BAF53" x="891" y="997"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_9501_AB53057BAF53" x="1060" y="997"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9501_AB53057BAF53" x="803" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9501_AB53057BAF53" x="803" y="681"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_9501_AB53057BAF53" x="977" y="681"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_847D_7D2636FCB6FA" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_847D_7D2636FCB6FA" text="+epo:refersToAwardDecision" modelElement="EAID_dst441146_4BC0_49e9_847D_7D2636FCB6FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_847D_7D2636FCB6FA" x="1047" y="479" width="116" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_847D_7D2636FCB6FA" x="959" y="153" width="116" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_847D_7D2636FCB6FA" text="0..*" modelElement="EAID_dst441146_4BC0_49e9_847D_7D2636FCB6FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_847D_7D2636FCB6FA" x="1146" y="502" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_847D_7D2636FCB6FA" x="1058" y="176" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_847D_7D2636FCB6FA" x="907" y="734"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_847D_7D2636FCB6FA" x="907" y="497"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_847D_7D2636FCB6FA" x="1165" y="497"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_847D_7D2636FCB6FA" x="819" y="408"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_847D_7D2636FCB6FA" x="819" y="171"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_847D_7D2636FCB6FA" x="1077" y="171"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_A32A_669CA4829E33" source="EAID_71373AFD_6871_4946_B921_97A716439257" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_69AA_430c_A32A_669CA4829E33" text="+epo:refersToLot" modelElement="EAID_dstA06CD6_3F60_4e8f_A32A_669CA4829E33">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_A32A_669CA4829E33" x="1182" y="746" width="69" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_A32A_669CA4829E33" x="1094" y="420" width="69" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_A32A_669CA4829E33" text="1..*" modelElement="EAID_dstA06CD6_3F60_4e8f_A32A_669CA4829E33">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_A32A_669CA4829E33" x="1234" y="769" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_A32A_669CA4829E33" x="1146" y="443" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_A32A_669CA4829E33" x="957" y="764"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_A32A_669CA4829E33" x="1253" y="764"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_A32A_669CA4829E33" x="869" y="438"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_A32A_669CA4829E33" x="1165" y="438"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8F66_FA023FA190E7" x="1368" y="759" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8F66_FA023FA190E7" x="1280" y="433" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8F66_FA023FA190E7" x="1355" y="781" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8F66_FA023FA190E7" x="1267" y="455" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8F66_FA023FA190E7" x="980" y="1093"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8F66_FA023FA190E7" x="1474" y="1093"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8F66_FA023FA190E7" x="1474" y="776"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_8F66_FA023FA190E7" x="1352" y="776"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8F66_FA023FA190E7" x="892" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_8F66_FA023FA190E7" x="1386" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_8F66_FA023FA190E7" x="1386" y="450"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_69AA_430c_8F66_FA023FA190E7" x="1264" y="450"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9195_C96F98BD3349" x="1220" y="680" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_9195_C96F98BD3349" x="1132" y="354" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9195_C96F98BD3349" x="1310" y="703" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_9195_C96F98BD3349" x="1222" y="377" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9195_C96F98BD3349" x="1214" y="329"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9195_C96F98BD3349" x="1214" y="395"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_AEBA_EA277D05F7E8" text="+epo:hasInternalIdentifier" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_AEBA_EA277D05F7E8" x="148" y="640" width="105" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_AEBA_EA277D05F7E8" text="0..*" modelElement="EAID_dst771AD3_C775_4324_AEBA_EA277D05F7E8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_AEBA_EA277D05F7E8" x="208" y="656" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_9195_C96F98BD3349" x="1302" y="655"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_9195_C96F98BD3349" x="1302" y="721"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_AEBA_EA277D05F7E8" x="1129" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_AEBA_EA277D05F7E8" x="200" y="602"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_AEBA_EA277D05F7E8" x="200" y="674"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BFE6_593632EDB11F" x="1237" y="812" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_BFE6_593632EDB11F" x="1149" y="486" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BFE6_593632EDB11F" x="1314" y="796" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_BFE6_593632EDB11F" x="1226" y="470" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BFE6_593632EDB11F" x="1302" y="867"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BFE6_593632EDB11F" x="1302" y="791"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_BFE6_593632EDB11F" x="1214" y="547"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_BFE6_593632EDB11F" x="1214" y="465"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2A14808D_69AA_430c_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_69AA_430c_8467_9DDA71E8D534" text="+adms:identifier" modelElement="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_69AA_430c_8467_9DDA71E8D534" x="271" y="643" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_69AA_430c_8467_9DDA71E8D534" text="0..1" modelElement="EAID_dst8CC8C6_3A48_4541_8467_9DDA71E8D534">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_69AA_430c_8467_9DDA71E8D534" x="310" y="656" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_69AA_430c_8467_9DDA71E8D534" x="1129" y="620"/>
+				<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="1037" y="574" width="97" height="14"/>
+					<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="1155" y="601" width="6" height="14"/>
+					<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="931" y="734"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_69AA_430c_AA2D_59AF706E79E6" x="931" y="596"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_69AA_430c_AA2D_59AF706E79E6" x="1163" y="596"/>
+				<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>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A0AB8EC3_27DC_4836_9DDA_8F8D6021B5BF" isFrame="false" modelElement="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8">
@@ -2536,11 +2549,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A0AB8EC3_27DC_4836_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_BF42_2A6E50CAF4E6" x="907" y="548" width="90" height="41"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_BF42_2A6E50CAF4E6" x="865" y="548" width="171" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A0AB8EC3_27DC_4836_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_80CC_7E68CBDEDED2" x="892" y="644" width="120" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DC_4836_80CC_7E68CBDEDED2" x="872" y="658" width="157" height="49"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A0AB8EC3_27DC_4836_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DC_4836_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
@@ -2567,24 +2580,24 @@
 			</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="724" y="658" width="166" height="14"/>
+					<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_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="873" y="681" width="17" height="14"/>
+					<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_A7C0_67100DC0E58E" x="583" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A7C0_67100DC0E58E" x="583" y="676"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A7C0_67100DC0E58E" x="892" y="676"/>
+				<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_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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_BFE6_593632EDB11F" x="884" y="524" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_BFE6_593632EDB11F" x="883" y="524" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_BFE6_593632EDB11F" x="960" y="508" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_BFE6_593632EDB11F" x="959" y="508" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_BFE6_593632EDB11F" x="948" y="548"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_BFE6_593632EDB11F" x="948" y="503"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_BFE6_593632EDB11F" x="947" y="548"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_BFE6_593632EDB11F" x="947" y="503"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_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_27DC_4836_B3C3_6654ABB348DF" text="+epo:refersToLot" modelElement="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF">
@@ -2675,14 +2688,14 @@
 			</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="812" y="545" width="93" height="14"/>
+					<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_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="888" y="568" width="17" height="14"/>
+					<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_A901_D1A6B9C4D5A7" x="602" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_A901_D1A6B9C4D5A7" x="602" y="563"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DC_4836_A901_D1A6B9C4D5A7" x="907" y="563"/>
+				<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"/>
@@ -2742,13 +2755,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_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_27DC_4836_93CA_CC7ACC63568D" text="+epo:describesLotGroup" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_93CA_CC7ACC63568D" x="896" y="613" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DC_4836_93CA_CC7ACC63568D" x="894" y="634" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DC_4836_93CA_CC7ACC63568D" text="1" modelElement="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_93CA_CC7ACC63568D" x="964" y="594" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DC_4836_93CA_CC7ACC63568D" x="962" y="615" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_93CA_CC7ACC63568D" x="952" y="644"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_93CA_CC7ACC63568D" x="952" y="589"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_93CA_CC7ACC63568D" x="950" y="658"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DC_4836_93CA_CC7ACC63568D" x="950" y="610"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A0AB8EC3_27DC_4836_AA0C_F4AAB1D0346B" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DC_4836_AA0C_F4AAB1D0346B" x="170" y="806"/>
@@ -2807,27 +2820,27 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1376593A_F78D_4947_A935_11584ADDCE8B" modelElement="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F78D_4947_A935_11584ADDCE8B" text="epo-not:PlanningNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F78D_4947_A935_11584ADDCE8B" x="299" y="74" width="390" height="52"/>
+				<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="630" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_8C16_9F9F412AC05A" x="630" y="126"/>
+				<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"/>
 			</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="356" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_88B6_1E31A0860DF8" x="356" y="126"/>
+				<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"/>
 			</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="503" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F78D_4947_AB06_244F1F3F1AC2" x="503" y="126"/>
+				<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"/>
 			</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"/>
@@ -2837,7 +2850,7 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A5805A07_E1A6_4af7_A5E5_508E4356B4F4" isFrame="false" modelElement="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A5805A07_E1A6_4af7_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_E1A6_4af7_AE42_0583F7417A79" text="epo-not:CompetitionNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1A6_4af7_AE42_0583F7417A79" x="466" y="85" width="162" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_E1A6_4af7_AE42_0583F7417A79" x="466" y="121" width="162" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLCompartmentableShape" xmi:id="EAID_A5805A07_E1A6_4af7_9639_C6126EF61343" modelElement="EAID_26558DD7_F7F2_428a_9639_C6126EF61343">
 				<ownedElement xmi:type="umldi:UMLTypedElementLabel" xmi:id="EAID_NL000000_E1A6_4af7_9639_C6126EF61343" text="pin-cfc-standard"/>
@@ -2901,13 +2914,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_A51D_3AD3E8CE91EB" x="921" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A51D_3AD3E8CE91EB" x="921" y="96"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_A51D_3AD3E8CE91EB" x="628" y="96"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A51D_3AD3E8CE91EB" x="921" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_A51D_3AD3E8CE91EB" x="628" y="132"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_B0DF_62CFC4CE6A0A" x="802" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_B0DF_62CFC4CE6A0A" x="802" y="113"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_B0DF_62CFC4CE6A0A" x="628" y="113"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_B0DF_62CFC4CE6A0A" x="802" y="149"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_B0DF_62CFC4CE6A0A" x="628" y="149"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_B050_E8519D3B2E42" source="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" target="EAID_D13A0500_D235_4f3b_B4D9_2AD8219EEC1C" modelElement="EAID_7F9EB2F3_4129_4956_B050_E8519D3B2E42">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_B050_E8519D3B2E42" x="799" y="284"/>
@@ -2915,8 +2928,8 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_A3D9_55355B814130" x="673" y="243"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A3D9_55355B814130" x="673" y="132"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_A3D9_55355B814130" x="628" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A3D9_55355B814130" x="673" y="168"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_A3D9_55355B814130" x="628" y="168"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_874D_C97371C6DFAE" source="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" target="EAID_716DDAC3_3B02_4995_8186_A0A9CC5C2625" modelElement="EAID_A8766EAE_C36E_455f_874D_C97371C6DFAE">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_874D_C97371C6DFAE" x="673" y="283"/>
@@ -2924,7 +2937,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_A3D5_722A4F20BE68" x="547" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A3D5_722A4F20BE68" x="547" y="140"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_A3D5_722A4F20BE68" x="547" y="176"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_B465_3A11AC2D0637" source="EAID_5DE4BBA5_24F3_4e6e_823C_BFF3401A979F" target="EAID_98353942_99DF_4d60_A891_FA4F1808024B" modelElement="EAID_EB89F5CE_C29C_492f_B465_3A11AC2D0637">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_B465_3A11AC2D0637" x="547" y="282"/>
@@ -2932,8 +2945,8 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_82CE_ED5F7075A3D5" x="416" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_82CE_ED5F7075A3D5" x="416" y="133"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_82CE_ED5F7075A3D5" x="466" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_82CE_ED5F7075A3D5" x="416" y="169"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_82CE_ED5F7075A3D5" x="466" y="169"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_8F40_1869208ADAD3" source="EAID_C04A3529_BA24_4b09_BA1E_34917AA6433D" target="EAID_62883740_6F33_4322_9F81_C66BE332931F" modelElement="EAID_10870294_9945_4f7f_8F40_1869208ADAD3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_8F40_1869208ADAD3" x="421" y="282"/>
@@ -2941,8 +2954,8 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_AD76_B35D2F6B65EC" x="302" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_AD76_B35D2F6B65EC" x="302" y="115"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_AD76_B35D2F6B65EC" x="466" y="115"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_AD76_B35D2F6B65EC" x="302" y="151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_AD76_B35D2F6B65EC" x="466" y="151"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_9992_56600281107A" source="EAID_592715F4_D66A_4a87_928F_BD5CC2C2E681" target="EAID_61FC3F77_34BE_43ab_924A_93C6CA3E47B6" modelElement="EAID_92F292F1_C78C_4903_9992_56600281107A">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_9992_56600281107A" x="295" y="282"/>
@@ -2950,8 +2963,8 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_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_E1A6_4af7_89DC_B3689DBDE53E" x="174" y="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_89DC_B3689DBDE53E" x="174" y="97"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_89DC_B3689DBDE53E" x="466" y="97"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E1A6_4af7_89DC_B3689DBDE53E" x="174" y="133"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_E1A6_4af7_89DC_B3689DBDE53E" x="466" y="133"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A5805A07_E1A6_4af7_84EC_09212E39E584" source="EAID_A055DBBD_DFB0_481c_8A60_5F8E32E52187" target="EAID_26558DD7_F7F2_428a_9639_C6126EF61343" modelElement="EAID_33DE10B8_8226_4476_84EC_09212E39E584">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E1A6_4af7_84EC_09212E39E584" x="169" y="282"/>
@@ -3955,10 +3968,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_86EA_27A080A75820" x="458" y="340"/>
 			</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="419"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4C4E_48f9_9D1C_4962C84B5FF6" x="413" y="419"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4C4E_48f9_9D1C_4962C84B5FF6" x="413" y="956"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4C4E_48f9_9D1C_4962C84B5FF6" x="771" y="956"/>
+				<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"/>
 			</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"/>
@@ -6257,6 +6270,36 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E286_4bf0_807D_22F8E9D742C0" x="400" y="119"/>
 			</ownedElement>
 		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_907CA309_53FE_4893_A1A0_3F38A045EBD3" isFrame="false" modelElement="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111">
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_9AC1_50EE42B5BBB1" modelElement="EAID_48067922_1CD8_4de9_9AC1_50EE42B5BBB1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_9AC1_50EE42B5BBB1" text="xsd:boolean"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_9AC1_50EE42B5BBB1" x="54" y="334" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_A9CA_5574C2E5283C" modelElement="EAID_AEA6D0EB_ACE7_45df_A9CA_5574C2E5283C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_A9CA_5574C2E5283C" text="xsd:anyURI"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_A9CA_5574C2E5283C" x="162" y="42" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_B8A8_D51DC8006B20" modelElement="EAID_4DBFF821_E794_4c04_B8A8_D51DC8006B20">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_B8A8_D51DC8006B20" text="xsd:date"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_B8A8_D51DC8006B20" x="54" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_9672_431FB80591B6" modelElement="EAID_8AA9E691_DDD7_44ec_9672_431FB80591B6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_9672_431FB80591B6" text="xsd:dateTime"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_9672_431FB80591B6" x="162" y="246" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_8797_C51B753C92CA" modelElement="EAID_BF47973A_E5D9_497f_8797_C51B753C92CA">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_8797_C51B753C92CA" text="xsd:integer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_8797_C51B753C92CA" x="162" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_A0DB_30E66759C38D" modelElement="EAID_A3AC489F_C4B5_4abe_A0DB_30E66759C38D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_A0DB_30E66759C38D" text="xsd:decimal"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_A0DB_30E66759C38D" x="54" y="134" width="90" height="38"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_907CA309_53FE_4893_8D18_876163190DD5" modelElement="EAID_F87884C5_7DFD_4c88_8D18_876163190DD5">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_53FE_4893_8D18_876163190DD5" text="rdf:PlainLiteral"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_53FE_4893_8D18_876163190DD5" x="54" y="41" width="90" height="38"/>
+			</ownedElement>
+		</umldi:Diagram>
 	</uml:Model>
 	<xmi:Extension extender="Enterprise Architect" extenderID="6.5">
 		<elements>
@@ -6358,16 +6401,6 @@
 					<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_7EC69E83_5203_42b9_817F_943268EF9139" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="0" ea_localid="3039" ea_eleType="element"/>
-				<properties documentation="This relation is used in std form mappings. Do we want to keep it at the Notice level, or use a more granular level (type of Notice)?" isSpecification="false" sType="Note" nType="1" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-12 12:44:24" modified="2023-06-12 12:45:27" 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="notice core" relatedlinks="idref1=EAID_F955E894_651A_4a8b_A411_E8DA312BC449;"/>
-			</element>
 			<element xmi:idref="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" xmi:type="uml:Note" scope="public">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" 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"/>
@@ -9540,6 +9573,90 @@
 					<Realisation xmi:id="EAID_DE7D8011_AFAB_45fe_9B56_E6B1BBE75F62" start="EAID_20FD7203_5B33_4a6e_A0A1_77A5B82A1E33" end="EAID_4BD860EF_5AF8_4fb4_B0D2_5C7B95031994"/>
 				</links>
 			</element>
+			<element xmi:idref="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_99794511_5F69_441e_87D0_04E4D2BA8111" package="EAPK_4595843F_E64E_4d88_A9BA_75D2C28EDDC9" tpos="4" ea_localid="211" 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="Notice"/>
+				<packageproperties version="1.0" tpos="4"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+			</element>
+			<element xmi:idref="EAID_F87884C5_7DFD_4c88_8D18_876163190DD5" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3157" 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:42: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_AEA6D0EB_ACE7_45df_A9CA_5574C2E5283C" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3152" 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_48067922_1CD8_4de9_9AC1_50EE42B5BBB1" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3151" 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_4DBFF821_E794_4c04_B8A8_D51DC8006B20" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3153" 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_8AA9E691_DDD7_44ec_9672_431FB80591B6" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3154" 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_A3AC489F_C4B5_4abe_A0DB_30E66759C38D" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3156" 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_BF47973A_E5D9_497f_8797_C51B753C92CA" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" tpos="0" ea_localid="3155" 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_F68B7543_9FB7_4a53_A12D_3B9DB56D9AD2">
@@ -11520,7 +11637,7 @@
 				</source>
 				<target xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
 					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
-					<role name="epo:describesResultNotice" visibility="Public" targetScope="instance"/>
+					<role name="epo:describesDirectAwardPrenotificationNotice" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -11535,7 +11652,7 @@
 				<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:describesDirectAwardPrenotificationNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -24889,9 +25006,9 @@
 			<diagram xmi:id="EAID_6785F76B_98DE_4cc5_9184_059956F5BBE9">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="127" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" 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-06-29 16:44:33"/>
+				<project author="andreea" version="1.0" created="2021-12-08 17:25:02" modified="2023-09-11 18:17: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=4C988A34;"/>
+				<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;"/>
 				<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/>
@@ -24904,29 +25021,27 @@
 					<element geometry="Left=348;Top=601;Right=519;Bottom=645;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="6" style="DUID=966D03EA;"/>
 					<element geometry="Left=946;Top=379;Right=960;Bottom=393;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="7" style=" DUID=73FD872E;"/>
 					<element geometry="Left=1137;Top=312;Right=1252;Bottom=358;" subject="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" seqno="8" style="DUID=B31F5A34;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=820;Top=107;Right=1007;Bottom=270;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="9" style="DUID=AAEF67D5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=820;Top=107;Right=1015;Bottom=270;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="9" style="DUID=AAEF67D5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1124;Top=601;Right=1295;Bottom=645;" subject="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" seqno="10" style="DUID=451CD439;"/>
 					<element geometry="Left=1454;Top=296;Right=1569;Bottom=375;" subject="EAID_8633DF60_DBCB_4ca7_AA83_B82252A1F6D6" seqno="11" style="DUID=9745C15E;"/>
 					<element geometry="Left=608;Top=347;Right=723;Bottom=393;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="12" style="DUID=2A939339;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=326;Top=724;Right=541;Bottom=792;" subject="EAID_7BE947BB_A71B_4e7a_AA2B_BE7308712695" seqno="13" style="DUID=D47D6707;"/>
-					<element geometry="Left=1318;Top=601;Right=1489;Bottom=645;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="14" style="DUID=855EBCEE;"/>
-					<element geometry="Left=799;Top=424;Right=1044;Bottom=564;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="15" style="DUID=ED8C0823;NSL=0;BCol=-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=298;Right=992;Bottom=312;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="16" style=" DUID=00C80082;"/>
-					<element geometry="Left=1454;Top=391;Right=1569;Bottom=470;" subject="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" seqno="17" style="DUID=DEA4DB37;"/>
-					<element geometry="Left=542;Top=601;Right=713;Bottom=645;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="18" style="DUID=D1703BEE;"/>
+					<element geometry="Left=1318;Top=601;Right=1489;Bottom=645;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="13" style="DUID=855EBCEE;"/>
+					<element geometry="Left=799;Top=424;Right=1044;Bottom=564;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="14" style="DUID=ED8C0823;NSL=0;BCol=-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=298;Right=992;Bottom=312;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="15" style=" DUID=00C80082;"/>
+					<element geometry="Left=1454;Top=391;Right=1569;Bottom=470;" subject="EAID_5AE64A69_B9E1_4007_8268_679A87B91611" seqno="16" style="DUID=DEA4DB37;"/>
+					<element geometry="Left=542;Top=601;Right=713;Bottom=645;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="17" style="DUID=D1703BEE;"/>
 					<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="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=3;EOID=00C80082;SOID=73FD872E;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_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=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;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=3;SCTR.LEFT=943;SCTR.TOP=-305;SCTR.RIGHT=1028;SCTR.BOTTOM=-237;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=27:OX=105:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=943:-270$943:-305$1028:-305$1028:-237$1007:-237$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=AAEF67D5;SOID=AAEF67D5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=987;SCTR.TOP=-124;SCTR.RIGHT=1020;SCTR.BOTTOM=-87;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=80:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1007:-124$1020:-124$1020:-87$987:-87$987:-107$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=AAEF67D5;SOID=AAEF67D5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=37;SY=16;EX=-6;EY=9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006" style="Mode=3;EOID=966D03EA;SOID=D47D6707;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=943;SCTR.TOP=-305;SCTR.RIGHT=1028;SCTR.BOTTOM=-237;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=27:OX=105:OY=32:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=943:-270$943:-305$1028:-305$1028:-237$1015:-237$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=AAEF67D5;SOID=AAEF67D5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=987;SCTR.TOP=-124;SCTR.RIGHT=1020;SCTR.BOTTOM=-87;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=80:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1015:-124$1020:-124$1020:-87$987:-87$987:-107$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=AAEF67D5;SOID=AAEF67D5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=3;EOID=00C80082;SOID=73FD872E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=0;EY=-33;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=631:-527$;" subject="EAID_AD106A36_48F1_47c9_A453_938579C970A7" style="Mode=3;EOID=ED8C0823;SOID=D1703BEE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-120;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=801:-370$;" subject="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" style="Mode=3;EOID=2A939339;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-52;SY=3;EX=-93;EY=-52;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=AAEF67D5;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=-10;EX=-29;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A87ED0E5_0C79_4015_8392_5BAE0E90B288" style="Mode=3;EOID=ED8C0823;SOID=698BF75E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-4;SY=0;EX=0;EY=20;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1399:-474$;" subject="EAID_05C9AA43_1AE1_4dbd_8080_CCC8C1824CB7" style="Mode=3;EOID=ED8C0823;SOID=855EBCEE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=0;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1210:-488$;" subject="EAID_95EED5E2_B9B4_4812_B1E5_07E432421C63" style="Mode=3;EOID=ED8C0823;SOID=451CD439;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -24935,16 +25050,15 @@
 					<element geometry="SX=8;SY=47;EX=8;EY=-9;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=0: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_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" style="Mode=3;EOID=171D0CE8;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=44;EX=-5;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112: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=660:-450$;" subject="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" style="Mode=3;EOID=2A939339;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=88;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79: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=1009:-337$;" subject="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" style="Mode=3;EOID=B31F5A34;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-52;SY=3;EX=-93;EY=-52;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=AAEF67D5;SOID=ED8C0823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=437:-494$;" subject="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314" style="Mode=3;EOID=ED8C0823;SOID=966D03EA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_DA3F165E_E1C4_443d_B43F_8EBB9AD26F8C">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="448" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="3"/>
 				<properties name="planning notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:11:24" modified="2023-06-22 15:12:13"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:11:24" modified="2023-09-11 18:17: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=FBD2A4A4;"/>
+				<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;"/>
 				<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/>
@@ -24953,16 +25067,16 @@
 					<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=498;" 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=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=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=45;Top=263;Right=216;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=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;"/>
 					<element geometry="Left=369;Top=52;Right=614;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=CFE4390D;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656" style="Mode=3;EOID=2623424E;SOID=BD3CEE0A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E00978F6_EFF6_47d8_84D3_E0EDCB7DC006" style="Mode=3;EOID=82CE8310;SOID=83DF0833;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=25;SX=0;SY=-27;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=1062:-325$1062:-485$;" subject="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" style="Mode=3;EOID=5B8E81D8;SOID=2623424E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=52: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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=51E75163;SOID=2623424E;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-9;SX=10;SY=0;EDGE=3;$LLB=;LLT=;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=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=140:-518$;" subject="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=51E75163;SOID=4D27ABEC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-9;SX=10;SY=0;EDGE=3;$LLB=;LLT=;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=CX=17:CY=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:-518$;" subject="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=51E75163;SOID=4D27ABEC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=0;EY=23;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9B54EEA9_42F0_4e42_A2F1_707153826314" style="Mode=3;EOID=CFE4390D;SOID=82CE8310;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=-5: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=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" style="Mode=3;EOID=2623424E;SOID=82CE8310;Color=-1;LWidth=0;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=-2:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61" style="Mode=3;EOID=4D27ABEC;SOID=82CE8310;Color=-1;LWidth=0;Hidden=0;"/>
@@ -24974,26 +25088,25 @@
 			<diagram xmi:id="EAID_B3CE5A4A_3421_4d83_835E_1908DA76EA1C">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="449" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="4"/>
 				<properties name="competition notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:14:11" modified="2023-06-22 15:13:05"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:14:11" modified="2023-09-11 18:17: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;"/>
-				<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=1BE64772;"/>
+				<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;"/>
 				<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=1154;Top=32;Right=1269;Bottom=129;" subject="EAID_7EC69E83_5203_42b9_817F_943268EF9139" seqno="1" style="DUID=51182CEE;"/>
-					<element geometry="Left=783;Top=242;Right=1061;Bottom=353;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="2" 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=877;Top=550;Right=967;Bottom=620;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="3" 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="4" 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="5" 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="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=04FBE2EE;"/>
-					<element geometry="Left=436;Top=253;Right=607;Bottom=323;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="7" style="NSL=0;DUID=AA72677B;"/>
+					<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="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;"/>
 					<element geometry="EDGE=1;SX=121;SY=0;EX=77;EY=0;SCTR=1;SCME=1;SCTR.LEFT=598;SCTR.TOP=-65;SCTR.RIGHT=642;SCTR.BOTTOM=-32;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=75:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=642:-52$642:-32$598:-32$598:-52$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=04FBE2EE;SOID=04FBE2EE;Color=-1;LWidth=0;TREE=OS;Hidden=0;"/>
 					<element geometry="EX=0;EY=-7;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=1117:-77$1117:-448$;" subject="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" style="Mode=3;EOID=9A69CDBB;SOID=04FBE2EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=1;SX=-1;SY=0;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=520:-584$;" subject="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B" style="Mode=3;EOID=9B655F6C;SOID=AA72677B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=1;SX=-1;SY=0;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=520:-585$;" subject="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B" style="Mode=3;EOID=9B655F6C;SOID=AA72677B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=2;SY=-8;EX=-9;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AD106A36_48F1_47c9_A453_938579C970A7" style="Mode=3;EOID=04FBE2EE;SOID=AA72677B;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=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=560:-442$;" subject="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49" style="Mode=3;EOID=9A69CDBB;SOID=AA72677B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=0;EX=3;EY=9;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=107:CY=14:OX=0: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_F365A241_4CD0_4009_A42F_041D198E70E4" style="Mode=3;EOID=62616085;SOID=AA72677B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -25003,9 +25116,9 @@
 			<diagram xmi:id="EAID_9E08D249_06F2_4b3b_9417_CC0CE30D81A7">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="450" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="6"/>
 				<properties name="result notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:18:01" modified="2023-06-22 15:18:31"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:18:01" modified="2023-09-11 18:18:43"/>
 				<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=AB896B18;"/>
+				<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;"/>
 				<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/>
@@ -25014,8 +25127,8 @@
 					<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=902;Top=574;Right=1022;Bottom=644;" 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=917;Top=483;Right=1007;Bottom=524;" 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=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;"/>
@@ -25028,14 +25141,14 @@
 					<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="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=0;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:-609$;" 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=-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=2;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:-501$;" subject="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0" style="Mode=3;EOID=35BF613A;SOID=85054196;Color=-1;LWidth=0;TREE=OR;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=48: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_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=35BF613A;SOID=C8C7962D;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;"/>
 				</elements>
@@ -25043,9 +25156,9 @@
 			<diagram xmi:id="EAID_FC576D8E_37E3_455d_A552_FC29948F779D">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="451" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="5"/>
 				<properties name="dap notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:39:29" modified="2023-06-22 15:15:42"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:39:29" modified="2023-09-11 18:18: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=E7F3E2D5;"/>
+				<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;"/>
 				<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/>
@@ -25053,26 +25166,26 @@
 					<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=790;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=873;Top=579;Right=963;Bottom=649;" 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=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="SX=0;SY=-13;EX=-62;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=14:OX=48: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=380:-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="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=1;SX=5;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:-634$;" subject="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" style="Mode=3;EOID=9DA7ECE1;SOID=D8E49E47;Color=-1;LWidth=0;TREE=OR;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:-595$;" 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=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=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=0;SY=0;EX=0;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=-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;"/>
@@ -25082,58 +25195,59 @@
 			<diagram xmi:id="EAID_2A14808D_69AA_430c_86C2_CDA04BE8C4F4">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="452" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="7"/>
 				<properties name="modification notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:46:29" modified="2023-07-05 16:55:05"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:46:29" modified="2023-09-11 18:20:40"/>
 				<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=88C3E98C;"/>
+				<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;"/>
 				<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=507;Top=1060;Right=640;Bottom=1113;" subject="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F" seqno="1" style="DUID=8B6342C3;"/>
-					<element geometry="Left=212;Top=1000;Right=419;Bottom=1088;" 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=182;Top=1158;Right=450;Bottom=1228;" subject="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" seqno="3" style="DUID=F98D6D43;"/>
-					<element geometry="Left=271;Top=1266;Right=361;Bottom=1326;" 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=1165;Top=451;Right=1438;Bottom=521;" 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=462;Top=860;Right=620;Bottom=930;" 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=1060;Top=964;Right=1212;Bottom=1034;" 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=1258;Top=867;Right=1348;Bottom=937;" 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=1163;Top=544;Right=1441;Bottom=655;" 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=1253;Top=721;Right=1352;Bottom=791;" 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=764;Top=1044;Right=980;Bottom=1129;" 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=507;Top=721;Right=678;Bottom=791;" 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=786;Top=734;Right=957;Bottom=778;" subject="EAID_71373AFD_6871_4946_B921_97A716439257" seqno="13" style="DUID=9AF536AF;NSL=0;"/>
-					<element geometry="Left=470;Top=501;Right=715;Bottom=664;" 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="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="SX=8;SY=0;EX=0;EY=7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=168: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=581:-1186$;" subject="EAID_005EFF4E_D969_4688_8461_8385AB23B103" style="Mode=3;EOID=F98D6D43;SOID=8B6342C3;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=82:OY=-18: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=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=675:-435$1549:-435$1549:-741$;" 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=587;SCTR.TOP=-503;SCTR.RIGHT=661;SCTR.BOTTOM=-463;$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=661:-501$661:-463$587:-463$587:-501$;" 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=696:-444$1493:-444$1493:-572$;" 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=-15;EY=-15;SX=-15;SY=-15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146:CY=14:OX=82: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_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=829:-973$573:-973$;" 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=0;SY=4;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=148: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=798:-625$;" 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=9;EX=0;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=1303:-990$;" 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=793:-899$;" 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=71;SY=0;EX=0;EY=5;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=942:-897$;" 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=891:-997$;" 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=907:-497$;" subject="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA" style="Mode=3;EOID=A7F3956C;SOID=9AF536AF;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:-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="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=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="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;"/>
 					<element geometry="EDGE=2;SX=4;SY=-8;EX=4;EY=-8;$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=;" subject="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33" style="Mode=3;EOID=0062DCF4;SOID=9AF536AF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-7;EX=0;EY=-20;EDGE=2;$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=1474:-1093$1474:-776$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=0062DCF4;SOID=B652767C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-7;EX=0;EY=-20;EDGE=2;$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=1386:-767$1386:-450$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=0062DCF4;SOID=B652767C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=96: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=0062DCF4;SOID=DEB89479;Color=-1;LWidth=0;Hidden=0;"/>
+					<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;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=0FF36BBD;SOID=950FA32A;Color=-1;LWidth=0;Hidden=1;"/>
-					<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=931:-596$;" 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=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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_A0AB8EC3_27DC_4836_9DDA_8F8D6021B5BF">
 				<model package="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" localID="453" owner="EAPK_BD23B8EE_A621_4d1e_A562_7BA554221AA8" tpos="8"/>
 				<properties name="completion notice relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-04-30 16:48:40" modified="2023-07-14 14:37:39"/>
+				<project author="andreea" version="1.0" created="2023-04-30 16:48:40" modified="2023-09-11 18:21:04"/>
 				<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=E21AD82C;"/>
+				<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;"/>
 				<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/>
@@ -25144,15 +25258,15 @@
 					<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=892;Top=644;Right=1012;Bottom=714;" 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=907;Top=548;Right=997;Bottom=589;" 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=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=3;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:-676$;" 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=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="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;"/>
@@ -25162,7 +25276,7 @@
 					<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=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="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=45;SY=0;EX=0;EY=5;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=602:-563$;" 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=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=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;"/>
@@ -25194,14 +25308,14 @@
 			<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-06-29 16:46:42"/>
+				<project author="andreea" version="1.0" created="2021-12-09 11:59:04" modified="2023-09-11 18:21: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=65C10481;"/>
+				<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;"/>
 				<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=299;Top=74;Right=689;Bottom=126;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="1" style="DUID=3C88F842;NSL=0;BCol=-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=126;Right=689;Bottom=178;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="1" style="DUID=3C88F842;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=449;Top=246;Right=539;Bottom=281;" subject="EAID_A31D0982_B460_4636_82B7_C2AF2C92D0B7" seqno="2" style="DUID=144D6ADE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=449;Top=334;Right=539;Bottom=384;" subject="EAID_A28E85B5_919D_438c_AD5D_BCC5C9355C2F" seqno="3" style="DUID=049A5B27;NSL=0;BCol=-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=246;Right=389;Bottom=281;" subject="EAID_9A9E6106_6655_4d55_9343_6884F40C1496" seqno="4" style="DUID=DB9B4B45;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -25219,9 +25333,9 @@
 			<diagram xmi:id="EAID_A5805A07_E1A6_4af7_A5E5_508E4356B4F4">
 				<model package="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F" localID="135" owner="EAPK_5CECF7F0_525A_4b25_9FF6_A2777C94113F"/>
 				<properties name="competition notices" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-09 12:39:28" modified="2022-11-15 13:05:16"/>
+				<project author="andreea" version="1.0" created="2021-12-09 12:39:28" modified="2023-09-11 18:23: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=CE317AA1;"/>
+				<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=BFB1E974;"/>
 				<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/>
@@ -25240,20 +25354,20 @@
 					<element geometry="Left=628;Top=243;Right=718;Bottom=283;" subject="EAID_4E444B8E_FC46_42b6_9A28_4F03AE4B456A" seqno="12" style="DUID=E88336D1;"/>
 					<element geometry="Left=754;Top=244;Right=844;Bottom=284;" subject="EAID_33778168_3AF6_4d83_B03E_875438FD6EAC" seqno="13" style="DUID=3E41379C;"/>
 					<element geometry="Left=124;Top=351;Right=214;Bottom=401;" subject="EAID_26558DD7_F7F2_428a_9639_C6126EF61343" seqno="14" style="DUID=49B1420F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=466;Top=85;Right=628;Bottom=140;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="15" style="DUID=92DB5666;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=466;Top=121;Right=628;Bottom=176;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="15" style="DUID=92DB5666;NSL=0;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=83:CY=14:OX=60: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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C5433006_EE53_4f4f_86DD_C7E911929926" style="Mode=3;EOID=C2AA74EC;SOID=01CAC6C4;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-4;SY=0;EX=0;EY=16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=921:-96$;" subject="EAID_B69D002B_14AF_4080_A51D_3AD3E8CE91EB" style="Mode=3;EOID=92DB5666;SOID=01CAC6C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=3;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=802:-113$;" subject="EAID_6D29D1B0_227D_4d86_B0DF_62CFC4CE6A0A" style="Mode=3;EOID=92DB5666;SOID=3E41379C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-4;SY=0;EX=0;EY=16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=921:-132$;" subject="EAID_B69D002B_14AF_4080_A51D_3AD3E8CE91EB" style="Mode=3;EOID=92DB5666;SOID=01CAC6C4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=3;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=802:-149$;" subject="EAID_6D29D1B0_227D_4d86_B0DF_62CFC4CE6A0A" style="Mode=3;EOID=92DB5666;SOID=3E41379C;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=57: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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7F9EB2F3_4129_4956_B050_E8519D3B2E42" style="Mode=3;EOID=7BA54186;SOID=3E41379C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=-20;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=673:-132$;" subject="EAID_BC6D5FD3_0356_4463_A3D9_55355B814130" style="Mode=3;EOID=92DB5666;SOID=E88336D1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=-20;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=673:-168$;" subject="EAID_BC6D5FD3_0356_4463_A3D9_55355B814130" style="Mode=3;EOID=92DB5666;SOID=E88336D1;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=57: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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A8766EAE_C36E_455f_874D_C97371C6DFAE" style="Mode=3;EOID=B93F66C9;SOID=E88336D1;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_83C8FB41_B08A_49a2_A3D5_722A4F20BE68" style="Mode=3;EOID=92DB5666;SOID=230D6C4A;Color=-1;LWidth=0;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=-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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EB89F5CE_C29C_492f_B465_3A11AC2D0637" style="Mode=3;EOID=CA2650DD;SOID=230D6C4A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=416:-133$;" subject="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5" style="Mode=3;EOID=92DB5666;SOID=F4505051;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=416:-169$;" subject="EAID_77A997B5_6993_4de4_82CE_ED5F7075A3D5" style="Mode=3;EOID=92DB5666;SOID=F4505051;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=57: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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_10870294_9945_4f7f_8F40_1869208ADAD3" style="Mode=3;EOID=95C0A9D9;SOID=F4505051;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=7;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=302:-115$;" subject="EAID_51552DDF_3D55_4c2a_AD76_B35D2F6B65EC" style="Mode=3;EOID=92DB5666;SOID=0E661F2F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=7;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=302:-151$;" subject="EAID_51552DDF_3D55_4c2a_AD76_B35D2F6B65EC" style="Mode=3;EOID=92DB5666;SOID=0E661F2F;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=48:OY=-18: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=;" subject="EAID_92F292F1_C78C_4903_9992_56600281107A" style="Mode=3;EOID=879583AD;SOID=0E661F2F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=5;SY=0;EX=0;EY=15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=174:-97$;" subject="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E" style="Mode=3;EOID=92DB5666;SOID=5D805C48;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=5;SY=0;EX=0;EY=15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=174:-133$;" subject="EAID_3F8437A0_516C_4b2e_89DC_B3689DBDE53E" style="Mode=3;EOID=92DB5666;SOID=5D805C48;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=54:OY=-14:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=4:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_33DE10B8_8226_4476_84EC_09212E39E584" style="Mode=3;EOID=49B1420F;SOID=5D805C48;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
@@ -25562,9 +25676,9 @@
 			<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="2022-11-15 13:16:12"/>
+				<project author="andreea" version="1.0" created="2021-12-10 10:40:42" modified="2023-09-11 18:22:43"/>
 				<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=2489912E;"/>
+				<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;"/>
 				<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/>
@@ -25602,7 +25716,7 @@
 					<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="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=34;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=413:-419$413:-956$;" 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=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=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;"/>
@@ -26348,6 +26462,25 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_88B8AF54_22A8_4ad0_807D_22F8E9D742C0" style="Mode=3;EOID=9F6C7E7E;SOID=68EB2F75;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
+			<diagram xmi:id="EAID_907CA309_53FE_4893_A1A0_3F38A045EBD3">
+				<model package="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" localID="485" owner="EAPK_99794511_5F69_441e_87D0_04E4D2BA8111" 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_F87884C5_7DFD_4c88_8D18_876163190DD5" seqno="1" style="DUID=CDF0DEC8;"/>
+					<element geometry="Left=54;Top=134;Right=144;Bottom=172;" subject="EAID_A3AC489F_C4B5_4abe_A0DB_30E66759C38D" seqno="2" style="DUID=58E0E855;"/>
+					<element geometry="Left=162;Top=134;Right=252;Bottom=172;" subject="EAID_BF47973A_E5D9_497f_8797_C51B753C92CA" seqno="3" style="DUID=FECD32A9;"/>
+					<element geometry="Left=162;Top=246;Right=252;Bottom=284;" subject="EAID_8AA9E691_DDD7_44ec_9672_431FB80591B6" seqno="4" style="DUID=FE8A7A67;"/>
+					<element geometry="Left=54;Top=246;Right=144;Bottom=284;" subject="EAID_4DBFF821_E794_4c04_B8A8_D51DC8006B20" seqno="5" style="DUID=687ECBA0;"/>
+					<element geometry="Left=162;Top=42;Right=252;Bottom=80;" subject="EAID_AEA6D0EB_ACE7_45df_A9CA_5574C2E5283C" seqno="6" style="DUID=DB87462E;"/>
+					<element geometry="Left=54;Top=334;Right=144;Bottom=372;" subject="EAID_48067922_1CD8_4de9_9AC1_50EE42B5BBB1" seqno="7" style="DUID=FDA8D244;"/>
+				</elements>
+			</diagram>
 		</diagrams>
 	</xmi:Extension>
 </xmi:XMI>
diff --git a/implementation/eOrdering/xmi_conceptual_model/eOrdering_CM.xml b/implementation/eOrdering/xmi_conceptual_model/eOrdering_CM.xml
index 28fe84c1..01147399 100644
--- a/implementation/eOrdering/xmi_conceptual_model/eOrdering_CM.xml
+++ b/implementation/eOrdering/xmi_conceptual_model/eOrdering_CM.xml
@@ -4,832 +4,811 @@
 	<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" name="diagrams">
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_CC6B1D12_ADEE_42c9_87B4_F2A894F1683B" body="Primary roles:&#xA;Agents that are directly involved with the exchange of information.&#xA;Secondary roles: &#xA;Agents only mentioned in the documents but not really involved in the information manipulation &amp;amp; exchange. &#xA;Note: The context may change the roles primacy. &#xA;Note: There is a mixture of pre/post-award roles. Perhaps a distinction shall be done.&#xA;Note: Perhaps no role hierarchy is necessary.&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;">
-						<annotatedElement xmi:idref="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C"/>
-					</ownedComment>
-					<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"/>
-						<annotatedElement xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
-					</ownedComment>
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" body="Context: Expressing Needs">
-						<annotatedElement xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
-					</ownedComment>
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" body="Needs to be aligned with eCatalogue in order to chose a codelist to be used.">
-						<annotatedElement xmi:idref="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
-					</ownedComment>
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" body="We need codes for: https://docs.peppol.eu/poacc/upgrade-3/2022-Q4/codelist/UNCL1001_T01/&#xA;&#xA;220 code is plain Order.">
-						<annotatedElement xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
-					</ownedComment>
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" body="Context: &#xA;Ordering, Despatch">
-						<annotatedElement xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-					</ownedComment>
+				<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"/>
+					<annotatedElement xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD"/>
+				</ownedComment>
+				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" body="Context: Expressing Needs">
+					<annotatedElement xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
+				</ownedComment>
+				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" body="We need codes for: https://docs.peppol.eu/poacc/upgrade-3/2022-Q4/codelist/UNCL1001_T01/&#xA;&#xA;220 code is plain Order.">
+					<annotatedElement xmi:idref="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
+				</ownedComment>
+				<ownedComment xmi:type="uml:Comment" xmi:id="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" body="Context: &#xA;Ordering, Despatch">
+					<annotatedElement xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
+				</ownedComment>
+				<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_LI000001_8DD8_49b7_8986_81DD8F3654E4" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_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_LI000003_FDB2_441a_98C2_1EDF890CF3DD" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_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_LI000005__C07B_4868_91B2_799578663395" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__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_LI000007__C2AD_43de_925D_13E9A7667A18" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008__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>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" name="classes">
-					<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_LI000001_8DD8_49b7_8986_81DD8F3654E4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002_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_LI000003_FDB2_441a_98C2_1EDF890CF3DD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_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_LI000005__C07B_4868_91B2_799578663395" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006__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_LI000007__C2AD_43de_925D_13E9A7667A18" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008__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>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" supplier="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" client="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-					<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:Dependency" xmi:id="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" supplier="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" client="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-					<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:Dependency" xmi:id="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D" supplier="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25" client="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
-						<memberEnd xmi:idref="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF"/>
-						<memberEnd xmi:idref="EAID_srcEE05CA_6A1E_4946_A54F_BC6967C07ADF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEE05CA_6A1E_4946_A54F_BC6967C07ADF" association="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
-							<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-						<memberEnd xmi:idref="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89"/>
-						<memberEnd xmi:idref="EAID_src70E246_3BA3_4795_8084_FD257C99FB89"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src70E246_3BA3_4795_8084_FD257C99FB89" association="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD708FC_CE05_4098_ADF6_2FEC3A1BB755" association="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</ownedEnd>
-					</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_LI000009_6E25_4ae3_A76B_B552B9987D94" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_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_LI000011__1E2A_4cd7_9F26_8CD173F2F4F7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__1E2A_4cd7_9F26_8CD173F2F4F7" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-						<memberEnd xmi:idref="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
-						<memberEnd xmi:idref="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" association="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-							<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
-						<memberEnd xmi:idref="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D"/>
-						<memberEnd xmi:idref="EAID_src2DCABC_3EFA_4af4_B368_9AA9D2B6757D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2DCABC_3EFA_4af4_B368_9AA9D2B6757D" association="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
-						<memberEnd xmi:idref="EAID_dst9B2205_58A2_42e8_ACA2_4C099B935E15"/>
-						<memberEnd xmi:idref="EAID_src9B2205_58A2_42e8_ACA2_4C099B935E15"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B2205_58A2_42e8_ACA2_4C099B935E15" association="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" name="epo-ord:OriginatorInformation">
-						<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_LI000013__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__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_LI000015__94EF_4bae_941E_311C9FC4668A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__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_LI000017__8F43_4db4_900E_D8D8F18E8521" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__8F43_4db4_900E_D8D8F18E8521" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
-						<memberEnd xmi:idref="EAID_dstA55DED_4624_43a3_8FA7_D8F2D6516D40"/>
-						<memberEnd xmi:idref="EAID_srcA55DED_4624_43a3_8FA7_D8F2D6516D40"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA55DED_4624_43a3_8FA7_D8F2D6516D40" association="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
-							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-						<memberEnd xmi:idref="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A"/>
-						<memberEnd xmi:idref="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A" association="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
-						<memberEnd xmi:idref="EAID_dst53180A_8F43_4db4_900E_D8D8F18E8521"/>
-						<memberEnd xmi:idref="EAID_src53180A_8F43_4db4_900E_D8D8F18E8521"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53180A_8F43_4db4_900E_D8D8F18E8521" association="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
-							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
-						<memberEnd xmi:idref="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245"/>
-						<memberEnd xmi:idref="EAID_src3F1621_7810_4b80_BE0A_37F252FE6245"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3F1621_7810_4b80_BE0A_37F252FE6245" association="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<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_LI000019__F5E0_4885_8D46_5814F76AE356" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__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_LI000021__C373_4894_AF6D_C4779365607A" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__C373_4894_AF6D_C4779365607A" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
-						<memberEnd xmi:idref="EAID_dstC34048_F5E0_4885_8D46_5814F76AE356"/>
-						<memberEnd xmi:idref="EAID_srcC34048_F5E0_4885_8D46_5814F76AE356"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC34048_F5E0_4885_8D46_5814F76AE356" association="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
-							<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-						<memberEnd xmi:idref="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A"/>
-						<memberEnd xmi:idref="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A" association="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-							<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD">
-						<memberEnd xmi:idref="EAID_dstE7ABA9_FFB1_4212_81E5_12821EB05CDD"/>
-						<memberEnd xmi:idref="EAID_srcE7ABA9_FFB1_4212_81E5_12821EB05CDD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE7ABA9_FFB1_4212_81E5_12821EB05CDD" association="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</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_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_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>
-						<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_LI000027__3F1B_4466_A940_494C66EC292F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__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_LI000029__9817_4356_BF94_B8B6325FE628" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__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_LI000031__D274_4157_BCA8_CFEC07ED34AE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__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_LI000033__3D4F_480a_B24B_49A69CC51624" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__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_LI000035__3EFA_4af4_B368_9AA9D2B6757D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__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_LI000037__94E2_4a5f_BF21_25D103CB3656" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__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_LI000039__58A2_42e8_ACA2_4C099B935E15" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__58A2_42e8_ACA2_4C099B935E15" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
-						<memberEnd xmi:idref="EAID_dst2635C6_3F1B_4466_A940_494C66EC292F"/>
-						<memberEnd xmi:idref="EAID_src2635C6_3F1B_4466_A940_494C66EC292F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2635C6_3F1B_4466_A940_494C66EC292F" association="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
-						<memberEnd xmi:idref="EAID_dstDD985E_9817_4356_BF94_B8B6325FE628"/>
-						<memberEnd xmi:idref="EAID_srcDD985E_9817_4356_BF94_B8B6325FE628"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDD985E_9817_4356_BF94_B8B6325FE628" association="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-						<memberEnd xmi:idref="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
-						<memberEnd xmi:idref="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE" association="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
-						</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_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_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
-						<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
-						<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6" association="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
-						<memberEnd xmi:idref="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19"/>
-						<memberEnd xmi:idref="EAID_src5A5085_B775_40dd_87F4_44B260BCBB19"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5A5085_B775_40dd_87F4_44B260BCBB19" association="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<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_LI000041_12D3_4013_8F09_B434DAB0D6BA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042_12D3_4013_8F09_B434DAB0D6BA" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F7F0C2E3_150D_4fee_9640_2BAECC99410D" name="epo-ful:hasAllowanceChargeReasonDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043_150D_4fee_9640_2BAECC99410D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044_150D_4fee_9640_2BAECC99410D" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1A5886B6_3780_442c_B301_604581D5936A" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F" name="epo:isCalculatedOn" association="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__B4FE_48a4_91D4_F6387465413F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__B4FE_48a4_91D4_F6387465413F" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF" name="epo-ord:hasTaxInformation" association="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
-							<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__6A1E_4946_A54F_BC6967C07ADF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__6A1E_4946_A54F_BC6967C07ADF" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F" name="epo-cat:hasAmount" association="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__B255_4c67_AAF8_2E19960E553F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__B255_4c67_AAF8_2E19960E553F" value="1"/>
-						</ownedAttribute>
-					</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_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:Dependency" xmi:id="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" supplier="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" client="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" name="epo-ord:AllowanceInformation">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst38C487_B424_424e_A34E_13EA1CB113F2" name="epo-ord:isSpecificToOrderLine" association="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__B424_424e_A34E_13EA1CB113F2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
-						<memberEnd xmi:idref="EAID_dst38C487_B424_424e_A34E_13EA1CB113F2"/>
-						<memberEnd xmi:idref="EAID_src38C487_B424_424e_A34E_13EA1CB113F2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src38C487_B424_424e_A34E_13EA1CB113F2" association="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
-							<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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB1CFC6_0B95_4c94_B742_4DC2F5EAF55E" association="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD92701_64B7_43fe_A8FE_020E2E87A51A" association="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<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_LI000053__EF6B_4c76_8A07_9FF99AC0CF07" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__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_LI000055__7364_4118_9D94_CE93A68B3CF9" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__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_LI000057__8DA9_46f5_A0D6_59757CEC226D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__8DA9_46f5_A0D6_59757CEC226D" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-						<memberEnd xmi:idref="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
-						<memberEnd xmi:idref="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07" association="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-						</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_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
-						<memberEnd xmi:idref="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
-						<memberEnd xmi:idref="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D" association="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
-							<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-						<memberEnd xmi:idref="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E"/>
-						<memberEnd xmi:idref="EAID_src338F2C_8F52_4c58_8FE0_29F2F5CFCD7E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" association="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18A153_57A6_4142_86D1_A887FC375039" association="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
-							<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
-						<memberEnd xmi:idref="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
-						<memberEnd xmi:idref="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0" association="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
-							<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
-						<memberEnd xmi:idref="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96"/>
-						<memberEnd xmi:idref="EAID_srcF5C9AF_E278_4ca2_80B9_C8B85FBF7E96"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF5C9AF_E278_4ca2_80B9_C8B85FBF7E96" association="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
-							<type xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" name="epo-ord:Seller">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-						<memberEnd xmi:idref="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8"/>
-						<memberEnd xmi:idref="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
-							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-						<memberEnd xmi:idref="EAID_dst89809C_E481_4fb3_9090_B37DC376C605"/>
-						<memberEnd xmi:idref="EAID_src89809C_E481_4fb3_9090_B37DC376C605"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89809C_E481_4fb3_9090_B37DC376C605" association="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BF61F37A_DE72_4467_A025_043DE09FF216">
-						<memberEnd xmi:idref="EAID_dst61F37A_DE72_4467_A025_043DE09FF216"/>
-						<memberEnd xmi:idref="EAID_src61F37A_DE72_4467_A025_043DE09FF216"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src61F37A_DE72_4467_A025_043DE09FF216" association="EAID_BF61F37A_DE72_4467_A025_043DE09FF216">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC5841_AE12_4b29_9A54_29BA5C9C4A38" association="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" name="epo-ord:Consignee">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-						<memberEnd xmi:idref="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
-						<memberEnd xmi:idref="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" association="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</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_LI000059_5E7E_4f6b_88CC_0465F90D5A77" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060_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_LI000061_6C6C_4792_BA95_9DBC1C57FD5D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062_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_LI000063_C54B_479e_9D20_D1D2C915CB6C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_C54B_479e_9D20_D1D2C915CB6C" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</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_LI000065__AF44_49ad_8519_B199CADD080B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__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_LI000067__B02B_4433_AB2C_0A6E23A8559E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__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_LI000069__FFB1_4212_81E5_12821EB05CDD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__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_LI000071__8F52_4c58_8FE0_29F2F5CFCD7E" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__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_LI000073__A2EF_4905_B7BD_A92CA6123721" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__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_LI000075__9C26_4b4f_BCD6_23ABF38C12BE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__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_LI000077__A612_4ba0_B319_00C96CEA60BC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__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_LI000079__4470_4b0d_A142_494C41C8807D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__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_LI000081__8067_4f18_9B28_69541B862505" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__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_LI000083__19E8_400c_A438_44EEAB172389" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__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_LI000085__DE72_4467_A025_043DE09FF216" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__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_LI000087__0DFC_40d6_86C4_6F47177DB0C6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__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_LI000089__64B7_43fe_A8FE_020E2E87A51A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__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_LI000091__88B6_449b_B44C_0F56A31472A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__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_LI000093__D8B8_42a5_A6A1_F386873985BC" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__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_LI000095__5D16_4718_A790_6F3EB673B453" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__5D16_4718_A790_6F3EB673B453" 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_LI000097__B775_40dd_87F4_44B260BCBB19" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__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_LI000099__7810_4b80_BE0A_37F252FE6245" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__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_LI000101__3FB3_43b9_B9AB_1FE660C3663F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__3FB3_43b9_B9AB_1FE660C3663F" value="1"/>
-						</ownedAttribute>
-					</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_7129001E_A2EF_4905_B7BD_A92CA6123721">
-						<memberEnd xmi:idref="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721"/>
-						<memberEnd xmi:idref="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721" association="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1163CB_9C26_4b4f_BCD6_23ABF38C12BE" association="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
-						<memberEnd xmi:idref="EAID_dst3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
-						<memberEnd xmi:idref="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC" association="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</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_9866393B_8067_4f18_9B28_69541B862505">
-						<memberEnd xmi:idref="EAID_dst66393B_8067_4f18_9B28_69541B862505"/>
-						<memberEnd xmi:idref="EAID_src66393B_8067_4f18_9B28_69541B862505"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src66393B_8067_4f18_9B28_69541B862505" association="EAID_9866393B_8067_4f18_9B28_69541B862505">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</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_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_D2FAB429_5D16_4718_A790_6F3EB673B453">
-						<memberEnd xmi:idref="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453"/>
-						<memberEnd xmi:idref="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453" association="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
-							<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:Association" xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
-						<memberEnd xmi:idref="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9"/>
-						<memberEnd xmi:idref="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9" association="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC00307_2C3C_43a2_91E7_AA8247B7CEDD" association="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" name="epo-ord:Originator">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
-						<memberEnd xmi:idref="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
-						<memberEnd xmi:idref="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20" association="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
-							<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
-						</ownedEnd>
-					</packagedElement>
+				<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0D4101FD_7720_417c_B62C_6F674CDB3888" supplier="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A" client="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+				<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:Dependency" xmi:id="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" supplier="EAID_33A89700_846B_47cb_93D9_9D4729194EA6" client="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+				<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_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+					<memberEnd xmi:idref="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF"/>
+					<memberEnd xmi:idref="EAID_srcEE05CA_6A1E_4946_A54F_BC6967C07ADF"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEE05CA_6A1E_4946_A54F_BC6967C07ADF" association="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+						<type xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
+					<memberEnd xmi:idref="EAID_dst70E246_3BA3_4795_8084_FD257C99FB89"/>
+					<memberEnd xmi:idref="EAID_src70E246_3BA3_4795_8084_FD257C99FB89"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src70E246_3BA3_4795_8084_FD257C99FB89" association="EAID_3570E246_3BA3_4795_8084_FD257C99FB89">
+						<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD708FC_CE05_4098_ADF6_2FEC3A1BB755" association="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
+						<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					</ownedEnd>
+				</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_LI000009_6E25_4ae3_A76B_B552B9987D94" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_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_LI000011__1E2A_4cd7_9F26_8CD173F2F4F7" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__1E2A_4cd7_9F26_8CD173F2F4F7" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+					<memberEnd xmi:idref="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
+					<memberEnd xmi:idref="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" association="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+						<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
+					<memberEnd xmi:idref="EAID_dst2DCABC_3EFA_4af4_B368_9AA9D2B6757D"/>
+					<memberEnd xmi:idref="EAID_src2DCABC_3EFA_4af4_B368_9AA9D2B6757D"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2DCABC_3EFA_4af4_B368_9AA9D2B6757D" association="EAID_ED2DCABC_3EFA_4af4_B368_9AA9D2B6757D">
+						<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
+					<memberEnd xmi:idref="EAID_dst9B2205_58A2_42e8_ACA2_4C099B935E15"/>
+					<memberEnd xmi:idref="EAID_src9B2205_58A2_42e8_ACA2_4C099B935E15"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B2205_58A2_42e8_ACA2_4C099B935E15" association="EAID_F79B2205_58A2_42e8_ACA2_4C099B935E15">
+						<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" name="epo-ord:OriginatorInformation">
+					<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_LI000013__4624_43a3_8FA7_D8F2D6516D40" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__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_LI000015__94EF_4bae_941E_311C9FC4668A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016__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_LI000017__8F43_4db4_900E_D8D8F18E8521" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__8F43_4db4_900E_D8D8F18E8521" value="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
+					<memberEnd xmi:idref="EAID_dstA55DED_4624_43a3_8FA7_D8F2D6516D40"/>
+					<memberEnd xmi:idref="EAID_srcA55DED_4624_43a3_8FA7_D8F2D6516D40"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA55DED_4624_43a3_8FA7_D8F2D6516D40" association="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40">
+						<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+					<memberEnd xmi:idref="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A"/>
+					<memberEnd xmi:idref="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A" association="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+						<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
+					<memberEnd xmi:idref="EAID_dst53180A_8F43_4db4_900E_D8D8F18E8521"/>
+					<memberEnd xmi:idref="EAID_src53180A_8F43_4db4_900E_D8D8F18E8521"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53180A_8F43_4db4_900E_D8D8F18E8521" association="EAID_C553180A_8F43_4db4_900E_D8D8F18E8521">
+						<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
+					<memberEnd xmi:idref="EAID_dst3F1621_7810_4b80_BE0A_37F252FE6245"/>
+					<memberEnd xmi:idref="EAID_src3F1621_7810_4b80_BE0A_37F252FE6245"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3F1621_7810_4b80_BE0A_37F252FE6245" association="EAID_F03F1621_7810_4b80_BE0A_37F252FE6245">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<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_LI000019__F5E0_4885_8D46_5814F76AE356" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__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_LI000021__C373_4894_AF6D_C4779365607A" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__C373_4894_AF6D_C4779365607A" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
+					<memberEnd xmi:idref="EAID_dstC34048_F5E0_4885_8D46_5814F76AE356"/>
+					<memberEnd xmi:idref="EAID_srcC34048_F5E0_4885_8D46_5814F76AE356"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC34048_F5E0_4885_8D46_5814F76AE356" association="EAID_16C34048_F5E0_4885_8D46_5814F76AE356">
+						<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
+					<memberEnd xmi:idref="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A"/>
+					<memberEnd xmi:idref="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A" association="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
+						<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD">
+					<memberEnd xmi:idref="EAID_dstE7ABA9_FFB1_4212_81E5_12821EB05CDD"/>
+					<memberEnd xmi:idref="EAID_srcE7ABA9_FFB1_4212_81E5_12821EB05CDD"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE7ABA9_FFB1_4212_81E5_12821EB05CDD" association="EAID_36E7ABA9_FFB1_4212_81E5_12821EB05CDD">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</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_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_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>
+					<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_LI000027__3F1B_4466_A940_494C66EC292F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__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_LI000029__9817_4356_BF94_B8B6325FE628" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__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_LI000031__D274_4157_BCA8_CFEC07ED34AE" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__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_LI000033__3D4F_480a_B24B_49A69CC51624" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__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_LI000035__3EFA_4af4_B368_9AA9D2B6757D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__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_LI000037__94E2_4a5f_BF21_25D103CB3656" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__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_LI000039__58A2_42e8_ACA2_4C099B935E15" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__58A2_42e8_ACA2_4C099B935E15" value="1"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
+					<memberEnd xmi:idref="EAID_dst2635C6_3F1B_4466_A940_494C66EC292F"/>
+					<memberEnd xmi:idref="EAID_src2635C6_3F1B_4466_A940_494C66EC292F"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2635C6_3F1B_4466_A940_494C66EC292F" association="EAID_A52635C6_3F1B_4466_A940_494C66EC292F">
+						<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
+					<memberEnd xmi:idref="EAID_dstDD985E_9817_4356_BF94_B8B6325FE628"/>
+					<memberEnd xmi:idref="EAID_srcDD985E_9817_4356_BF94_B8B6325FE628"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDD985E_9817_4356_BF94_B8B6325FE628" association="EAID_ADDD985E_9817_4356_BF94_B8B6325FE628">
+						<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+					<memberEnd xmi:idref="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
+					<memberEnd xmi:idref="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE" association="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+						<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					</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_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_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
+					<memberEnd xmi:idref="EAID_dstBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
+					<memberEnd xmi:idref="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAD_DA48_4953_9445_B3D0C269B4E6" association="EAID_B9BA1AAD_DA48_4953_9445_B3D0C269B4E6">
+						<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
+					<memberEnd xmi:idref="EAID_dst5A5085_B775_40dd_87F4_44B260BCBB19"/>
+					<memberEnd xmi:idref="EAID_src5A5085_B775_40dd_87F4_44B260BCBB19"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5A5085_B775_40dd_87F4_44B260BCBB19" association="EAID_E35A5085_B775_40dd_87F4_44B260BCBB19">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<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_LI000041_12D3_4013_8F09_B434DAB0D6BA" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042_12D3_4013_8F09_B434DAB0D6BA" value="1"/>
+						<type xmi:idref="EAJava_xsd_decimal"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F7F0C2E3_150D_4fee_9640_2BAECC99410D" name="epo-ful:hasAllowanceChargeReasonDescription">
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000043_150D_4fee_9640_2BAECC99410D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044_150D_4fee_9640_2BAECC99410D" value="*"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_1A5886B6_3780_442c_B301_604581D5936A" general="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst2AF5A1_B4FE_48a4_91D4_F6387465413F" name="epo:isCalculatedOn" association="EAID_202AF5A1_B4FE_48a4_91D4_F6387465413F">
+						<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000045__B4FE_48a4_91D4_F6387465413F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__B4FE_48a4_91D4_F6387465413F" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstEE05CA_6A1E_4946_A54F_BC6967C07ADF" name="epo-ord:hasTaxInformation" association="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF">
+						<type xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000047__6A1E_4946_A54F_BC6967C07ADF" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048__6A1E_4946_A54F_BC6967C07ADF" value="1"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst6CC611_B255_4c67_AAF8_2E19960E553F" name="epo-cat:hasAmount" association="EAID_516CC611_B255_4c67_AAF8_2E19960E553F">
+						<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049__B255_4c67_AAF8_2E19960E553F" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050__B255_4c67_AAF8_2E19960E553F" value="1"/>
+					</ownedAttribute>
+				</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_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:Dependency" xmi:id="EAID_AF8C5388_D443_4b59_918C_44D86E9AC3CF" supplier="EAID_D72442ED_835D_455e_970E_3D4CAF26A2F5" client="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1"/>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" name="epo-ord:AllowanceInformation">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst38C487_B424_424e_A34E_13EA1CB113F2" name="epo-ord:isSpecificToOrderLine" association="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
+						<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+						<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051__B424_424e_A34E_13EA1CB113F2" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052__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"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
+					<memberEnd xmi:idref="EAID_dst38C487_B424_424e_A34E_13EA1CB113F2"/>
+					<memberEnd xmi:idref="EAID_src38C487_B424_424e_A34E_13EA1CB113F2"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src38C487_B424_424e_A34E_13EA1CB113F2" association="EAID_2938C487_B424_424e_A34E_13EA1CB113F2">
+						<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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB1CFC6_0B95_4c94_B742_4DC2F5EAF55E" association="EAID_15B1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+						<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD92701_64B7_43fe_A8FE_020E2E87A51A" association="EAID_C4D92701_64B7_43fe_A8FE_020E2E87A51A">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<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_LI000053__EF6B_4c76_8A07_9FF99AC0CF07" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054__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_LI000055__7364_4118_9D94_CE93A68B3CF9" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__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_LI000057__8DA9_46f5_A0D6_59757CEC226D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__8DA9_46f5_A0D6_59757CEC226D" value="1"/>
+					</ownedAttribute>
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_AA589EDA_B26B_44c3_BCCC_37421BA960DE" general="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+					<memberEnd xmi:idref="EAID_dst2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
+					<memberEnd xmi:idref="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2B76C7_EF6B_4c76_8A07_9FF99AC0CF07" association="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07">
+						<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					</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_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
+					<memberEnd xmi:idref="EAID_dst2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
+					<memberEnd xmi:idref="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2E5010_8DA9_46f5_A0D6_59757CEC226D" association="EAID_1F2E5010_8DA9_46f5_A0D6_59757CEC226D">
+						<type xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
+					<memberEnd xmi:idref="EAID_dst338F2C_8F52_4c58_8FE0_29F2F5CFCD7E"/>
+					<memberEnd xmi:idref="EAID_src338F2C_8F52_4c58_8FE0_29F2F5CFCD7E"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src338F2C_8F52_4c58_8FE0_29F2F5CFCD7E" association="EAID_46338F2C_8F52_4c58_8FE0_29F2F5CFCD7E">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src18A153_57A6_4142_86D1_A887FC375039" association="EAID_AD18A153_57A6_4142_86D1_A887FC375039">
+						<type xmi:idref="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
+					<memberEnd xmi:idref="EAID_dst259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
+					<memberEnd xmi:idref="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src259612_87E6_4f34_A3AA_B5B7E513AEA0" association="EAID_B0259612_87E6_4f34_A3AA_B5B7E513AEA0">
+						<type xmi:idref="EAID_495F0732_ED3E_4716_99EF_E09436BF89DC"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
+					<memberEnd xmi:idref="EAID_dstF5C9AF_E278_4ca2_80B9_C8B85FBF7E96"/>
+					<memberEnd xmi:idref="EAID_srcF5C9AF_E278_4ca2_80B9_C8B85FBF7E96"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF5C9AF_E278_4ca2_80B9_C8B85FBF7E96" association="EAID_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96">
+						<type xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" name="epo-ord:Seller">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+					<memberEnd xmi:idref="EAID_dstDB4B0B_7B20_475e_895E_9E7177239DE8"/>
+					<memberEnd xmi:idref="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB4B0B_7B20_475e_895E_9E7177239DE8" association="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8">
+						<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+					<memberEnd xmi:idref="EAID_dst89809C_E481_4fb3_9090_B37DC376C605"/>
+					<memberEnd xmi:idref="EAID_src89809C_E481_4fb3_9090_B37DC376C605"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src89809C_E481_4fb3_9090_B37DC376C605" association="EAID_6089809C_E481_4fb3_9090_B37DC376C605">
+						<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_BF61F37A_DE72_4467_A025_043DE09FF216">
+					<memberEnd xmi:idref="EAID_dst61F37A_DE72_4467_A025_043DE09FF216"/>
+					<memberEnd xmi:idref="EAID_src61F37A_DE72_4467_A025_043DE09FF216"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src61F37A_DE72_4467_A025_043DE09FF216" association="EAID_BF61F37A_DE72_4467_A025_043DE09FF216">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC5841_AE12_4b29_9A54_29BA5C9C4A38" association="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" name="epo-ord:Consignee">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
+					<memberEnd xmi:idref="EAID_dst0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
+					<memberEnd xmi:idref="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD" association="EAID_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
+				</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_LI000059_5E7E_4f6b_88CC_0465F90D5A77" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060_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_LI000061_6C6C_4792_BA95_9DBC1C57FD5D" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062_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_LI000063_C54B_479e_9D20_D1D2C915CB6C" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064_C54B_479e_9D20_D1D2C915CB6C" value="1"/>
+						<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</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_LI000065__AF44_49ad_8519_B199CADD080B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__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_LI000067__B02B_4433_AB2C_0A6E23A8559E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__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_LI000069__FFB1_4212_81E5_12821EB05CDD" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070__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_LI000071__8F52_4c58_8FE0_29F2F5CFCD7E" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072__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_LI000073__A2EF_4905_B7BD_A92CA6123721" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__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_LI000075__9C26_4b4f_BCD6_23ABF38C12BE" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__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_LI000077__A612_4ba0_B319_00C96CEA60BC" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__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_LI000079__4470_4b0d_A142_494C41C8807D" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__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_LI000081__8067_4f18_9B28_69541B862505" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__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_LI000083__19E8_400c_A438_44EEAB172389" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__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_LI000085__DE72_4467_A025_043DE09FF216" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086__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_LI000087__0DFC_40d6_86C4_6F47177DB0C6" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__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_LI000089__64B7_43fe_A8FE_020E2E87A51A" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__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_LI000091__88B6_449b_B44C_0F56A31472A7" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__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_LI000093__D8B8_42a5_A6A1_F386873985BC" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__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_LI000095__5D16_4718_A790_6F3EB673B453" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__5D16_4718_A790_6F3EB673B453" 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_LI000097__B775_40dd_87F4_44B260BCBB19" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__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_LI000099__7810_4b80_BE0A_37F252FE6245" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100__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_LI000101__3FB3_43b9_B9AB_1FE660C3663F" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102__3FB3_43b9_B9AB_1FE660C3663F" value="1"/>
+					</ownedAttribute>
+				</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_7129001E_A2EF_4905_B7BD_A92CA6123721">
+					<memberEnd xmi:idref="EAID_dst29001E_A2EF_4905_B7BD_A92CA6123721"/>
+					<memberEnd xmi:idref="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29001E_A2EF_4905_B7BD_A92CA6123721" association="EAID_7129001E_A2EF_4905_B7BD_A92CA6123721">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1163CB_9C26_4b4f_BCD6_23ABF38C12BE" association="EAID_7A1163CB_9C26_4b4f_BCD6_23ABF38C12BE">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
+					<memberEnd xmi:idref="EAID_dst3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
+					<memberEnd xmi:idref="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3DC23D_A612_4ba0_B319_00C96CEA60BC" association="EAID_813DC23D_A612_4ba0_B319_00C96CEA60BC">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</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_9866393B_8067_4f18_9B28_69541B862505">
+					<memberEnd xmi:idref="EAID_dst66393B_8067_4f18_9B28_69541B862505"/>
+					<memberEnd xmi:idref="EAID_src66393B_8067_4f18_9B28_69541B862505"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src66393B_8067_4f18_9B28_69541B862505" association="EAID_9866393B_8067_4f18_9B28_69541B862505">
+						<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					</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_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_D2FAB429_5D16_4718_A790_6F3EB673B453">
+					<memberEnd xmi:idref="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453"/>
+					<memberEnd xmi:idref="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453" association="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
+						<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:Association" xmi:id="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+					<memberEnd xmi:idref="EAID_dstABFF05_AE37_4d14_9F45_D060A347AAB9"/>
+					<memberEnd xmi:idref="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcABFF05_AE37_4d14_9F45_D060A347AAB9" association="EAID_05ABFF05_AE37_4d14_9F45_D060A347AAB9">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</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"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC00307_2C3C_43a2_91E7_AA8247B7CEDD" association="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" name="epo-ord:Originator">
+					<generalization xmi:type="uml:Generalization" xmi:id="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
+					<memberEnd xmi:idref="EAID_dst042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
+					<memberEnd xmi:idref="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src042A72_F34F_4e88_A8B6_7BE5B0CB8B20" association="EAID_95042A72_F34F_4e88_A8B6_7BE5B0CB8B20">
+						<type xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67"/>
+					</ownedEnd>
 				</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_AEA24CC6_B487_46a9_9300_987D2CB956CC" 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 (instanciate) a new order implementing the changes and superseding the previously sent order. ">
-						<annotatedElement xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-					</ownedComment>
-					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" body="Should we conceive that an order line is included in the Order Reponse? &#xA;&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1229/">
-						<annotatedElement xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						<annotatedElement xmi:idref="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
-					</ownedComment>
+				<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 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"/>
+					<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_B24F8F57_8DAD_4cdb_9BEE_5767CE983E15" name="ConditionallyAccepted"/>
+					<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_1FC0B8EF_32D2_4e7a_9594_902B0276FD91" name="InProgress"/>
+					<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_595C0FF9_E180_4858_A62B_1697C77AFCC4" name="Delivered"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" name="epo-ord:OrderResponseLine">
+					<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_LI000103__E278_4ca2_80B9_C8B85FBF7E96" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__E278_4ca2_80B9_C8B85FBF7E96" value="*"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
+					<memberEnd xmi:idref="EAID_dstCF78D6_E061_467c_8F33_D45D96E7471E"/>
+					<memberEnd xmi:idref="EAID_srcCF78D6_E061_467c_8F33_D45D96E7471E"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCF78D6_E061_467c_8F33_D45D96E7471E" association="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
+					<memberEnd xmi:idref="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B"/>
+					<memberEnd xmi:idref="EAID_srcB39003_2ED7_40e3_B01B_D11FF794AF2B"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB39003_2ED7_40e3_B01B_D11FF794AF2B" association="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
+						<type xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+					</ownedEnd>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" name="epo-ord:OrderResponseInformation">
+					<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_LI000105__2ED7_40e3_B01B_D11FF794AF2B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__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_LI000107__90EF_42ed_B918_7EEB88718C50" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__90EF_42ed_B918_7EEB88718C50" value="1"/>
+					</ownedAttribute>
+				</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:Dependency" xmi:id="EAID_9898A4B0_1319_468d_ACED_450943028D41" supplier="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" client="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
+					<memberEnd xmi:idref="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642"/>
+					<memberEnd xmi:idref="EAID_srcF97AE3_C138_47de_9B92_F1BE4B376642"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF97AE3_C138_47de_9B92_F1BE4B376642" association="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
+				</packagedElement>
+				<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_LI000109_628F_41fd_A787_5AF33D50812B" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110_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_LI000111__E061_467c_8F33_D45D96E7471E" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__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_LI000113__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__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_LI000115__C138_47de_9B92_F1BE4B376642" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__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_LI000117__AE12_4b29_9A54_29BA5C9C4A38" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__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_LI000119__EA5D_40db_B89D_FEC52A5F5DBC" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__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_LI000121__5DAC_4cec_8EE0_33C8C2F66C12" value="0"/>
+						<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__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>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" 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_LI000103_628F_41fd_A787_5AF33D50812B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104_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_LI000105__E061_467c_8F33_D45D96E7471E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__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_LI000107__2C3C_43a2_91E7_AA8247B7CEDD" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__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_LI000109__C138_47de_9B92_F1BE4B376642" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__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_LI000111__AE12_4b29_9A54_29BA5C9C4A38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112__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_LI000113__EA5D_40db_B89D_FEC52A5F5DBC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114__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_LI000115__5DAC_4cec_8EE0_33C8C2F66C12" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116__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>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
-						<memberEnd xmi:idref="EAID_dstCF78D6_E061_467c_8F33_D45D96E7471E"/>
-						<memberEnd xmi:idref="EAID_srcCF78D6_E061_467c_8F33_D45D96E7471E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCF78D6_E061_467c_8F33_D45D96E7471E" association="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
-						<memberEnd xmi:idref="EAID_dstF97AE3_C138_47de_9B92_F1BE4B376642"/>
-						<memberEnd xmi:idref="EAID_srcF97AE3_C138_47de_9B92_F1BE4B376642"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF97AE3_C138_47de_9B92_F1BE4B376642" association="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
-						<memberEnd xmi:idref="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
-						<memberEnd xmi:idref="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC" association="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-						<memberEnd xmi:idref="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
-						<memberEnd xmi:idref="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12" association="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" name="epo-ord:OrderResponseInformation">
-						<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_LI000117__2ED7_40e3_B01B_D11FF794AF2B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118__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_LI000119__90EF_42ed_B918_7EEB88718C50" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120__90EF_42ed_B918_7EEB88718C50" value="1"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
-						<memberEnd xmi:idref="EAID_dstB39003_2ED7_40e3_B01B_D11FF794AF2B"/>
-						<memberEnd xmi:idref="EAID_srcB39003_2ED7_40e3_B01B_D11FF794AF2B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB39003_2ED7_40e3_B01B_D11FF794AF2B" association="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
-							<type xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
-						</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:Dependency" xmi:id="EAID_9898A4B0_1319_468d_ACED_450943028D41" supplier="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" client="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" name="epo-ord:OrderResponseLine">
-						<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_LI000121__E278_4ca2_80B9_C8B85FBF7E96" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122__E278_4ca2_80B9_C8B85FBF7E96" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
+					<memberEnd xmi:idref="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
+					<memberEnd xmi:idref="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC" association="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_C1739D82_10E9_4721_BCE7_0F75EBD5D612" 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"/>
-						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_B24F8F57_8DAD_4cdb_9BEE_5767CE983E15" name="ConditionallyAccepted"/>
-						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_1FC0B8EF_32D2_4e7a_9594_902B0276FD91" name="InProgress"/>
-						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_595C0FF9_E180_4858_A62B_1697C77AFCC4" name="Delivered"/>
-					</packagedElement>
+				<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+					<memberEnd xmi:idref="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
+					<memberEnd xmi:idref="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
+					<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12" association="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+						<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					</ownedEnd>
 				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" name="datatype">
@@ -842,97 +821,94 @@
 				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C451B2CC_DD71_461f_8B8E_B08F284A9D7E" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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="395" y="806" width="115" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B222_35A41469D7C5" x="325" y="359" 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="555" y="821" width="115" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_A897_6A3BE5805EC3" x="472" y="359" 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="1122" y="685" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_95E7_ABB29EDCEDFD" x="1052" y="238" 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="974" y="533" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9284_B6F7309F5985" x="904" y="86" 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="850" y="685" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B8B3_4DB83EC94A01" x="780" y="238" 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="73" y="670" width="228" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_9655_04521F703750" x="51" y="222" 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="568" y="685" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B50E_A7C6B28E280E" x="485" y="238" 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="929" y="821" width="207" height="187"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_C451B2CC_DD71_461f_87B4_F2A894F1683B" modelElement="EAID_CC6B1D12_ADEE_42c9_87B4_F2A894F1683B">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_87B4_F2A894F1683B" x="51" y="375" width="271" height="149"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_887E_3D02A662D444" x="859" y="374" 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="407" y="685" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_844D_DCAF96861695" x="337" y="238" 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="394" y="533" width="115" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_B61A_99942ED53255" x="324" y="86" 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="983" y="685" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DD71_461f_8EF3_D893D4201BD3" x="913" y="238" width="96" 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="1031" y="685"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_BDBC_A13B860A4535" x="1031" y="603"/>
+				<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"/>
 			</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="1031" y="821"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9657_EC6B3D521C37" x="1031" y="755"/>
+				<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"/>
 			</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="981" y="821"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_924C_BF1F30BDA6CD" x="935" y="755"/>
+				<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"/>
 			</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="1098" y="821"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_A5A2_DD96859DF5FB" x="1145" y="755"/>
+				<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"/>
 			</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="612" y="821"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_87FA_6410FDD407CF" x="612" y="755"/>
+				<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"/>
 			</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="456" y="806"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_83B7_20456106C5AD" x="456" y="755"/>
+				<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"/>
 			</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="1132" y="685"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B4C0_912C9C11EC4E" x="1063" y="603"/>
+				<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"/>
 			</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="446" y="685"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8ABC_CDD0FA9EF71E" x="446" y="603"/>
+				<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"/>
 			</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="932" y="685"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_8105_4D93D49DFA8A" x="1004" y="603"/>
+				<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"/>
 			</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="575" y="685"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_B9C6_7721498D7537" x="488" y="603"/>
+				<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"/>
 			</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="298" y="670"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DD71_461f_9C21_84470056CF01" x="406" y="603"/>
+				<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"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937" isFrame="false" modelElement="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -1617,7 +1593,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AC99_495d_82FA_E8F122CD0638" x="1990" y="504"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD" isFrame="false" modelElement="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -1976,7 +1952,7 @@
 				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_FC3EFF3F_9A22_4a45_83B7_8A32BC22CFBE" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2087,7 +2063,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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_04F29F40_7172_4127_9D37_0EBF552EA455" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2177,7 +2153,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_7172_4127_A142_494C41C8807D" x="360" y="334"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62" isFrame="false" modelElement="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2228,7 +2204,7 @@
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_E929_4cb0_925D_13E9A7667A18" x="905" y="226" width="85" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_E929_4cb0_925D_13E9A7667A18" text="0..1" modelElement="EAID_dst123434_C2AD_43de_925D_13E9A7667A18">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E929_4cb0_925D_13E9A7667A18" x="958" y="246" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_E929_4cb0_925D_13E9A7667A18" x="958" y="246" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_E929_4cb0_925D_13E9A7667A18" x="950" y="212"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_E929_4cb0_925D_13E9A7667A18" x="950" y="264"/>
@@ -2285,7 +2261,7 @@
 				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_08CC4DDD_61A7_4ac7_8591_C19830AD66DB" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2312,16 +2288,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_B217_37E957B3B448" x="1228" y="81" width="184" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_B217_37E957B3B448" x="1228" y="81" width="195" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_AA65_095BEC507C12" modelElement="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_61A7_4ac7_AA65_095BEC507C12" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_AA65_095BEC507C12" text="at-voc-new:item-classification"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_AA65_095BEC507C12" x="1612" y="539" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_8539_9D1E0635944C" modelElement="EAID_38C2E543_06D2_464d_8539_9D1E0635944C">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_61A7_4ac7_8539_9D1E0635944C" x="1783" y="535" width="115" height="67"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_08CC4DDD_61A7_4ac7_93D9_9D4729194EA6" modelElement="EAID_33A89700_846B_47cb_93D9_9D4729194EA6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_61A7_4ac7_93D9_9D4729194EA6" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_61A7_4ac7_93D9_9D4729194EA6" text="at-voc-new:tax-scheme"/>
@@ -2352,23 +2325,22 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_84F1_8A3969FE662E" text="+epo:hasItemStandardID" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_84F1_8A3969FE662E" x="680" y="304" width="102" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_84F1_8A3969FE662E" text="0..1" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_84F1_8A3969FE662E" text="0..*" modelElement="EAID_dst464872_BFB6_40bb_84F1_8A3969FE662E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_84F1_8A3969FE662E" x="740" y="238" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_84F1_8A3969FE662E" x="1166" y="585"/>
 				<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="623" width="92" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_8084_FD257C99FB89" text="0..1" 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="646" 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="653" y="641"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_BD03_7B202CFA4807" x="1166" y="641"/>
 			</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">
@@ -2383,10 +2355,10 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_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_61A7_4ac7_8070_7102E73439C9" text="+epo-cat:hasExternalSpecification" modelElement="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8070_7102E73439C9" x="1255" y="299" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_8070_7102E73439C9" x="1259" y="299" width="135" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_8070_7102E73439C9" x="1315" y="454"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_8070_7102E73439C9" x="1315" y="244"/>
+				<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"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_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_61A7_4ac7_A201_D8391B5C67DF" text="+epo:hasBuyerItemID" modelElement="EAID_dstEFDC69_19B4_47d7_A201_D8391B5C67DF">
@@ -2399,19 +2371,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..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>
 			<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">
@@ -2497,33 +2476,30 @@
 				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_9BA3_E4AE6841A773" source="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" target="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" modelElement="EAID_645676C0_BCB7_41e3_9BA3_E4AE6841A773">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_9BA3_E4AE6841A773" x="1783" y="568"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_9BA3_E4AE6841A773" x="1702" y="568"/>
-			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_B72E_BC6C99FF3009" x="1414" y="98" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_61A7_4ac7_B72E_BC6C99FF3009" x="1425" y="98" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_61A7_4ac7_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_B72E_BC6C99FF3009" x="1415" y="96" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_61A7_4ac7_B72E_BC6C99FF3009" x="1426" y="96" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_B72E_BC6C99FF3009" x="1412" y="125"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_B72E_BC6C99FF3009" x="1412" y="125"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_61A7_4ac7_B72E_BC6C99FF3009" x="1423" y="125"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_61A7_4ac7_B72E_BC6C99FF3009" x="1423" y="125"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_61A7_4ac7_B72E_BC6C99FF3009" x="1440" y="125"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_61A7_4ac7_B72E_BC6C99FF3009" x="1440" y="91"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_61A7_4ac7_B72E_BC6C99FF3009" x="1412" y="91"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_61A7_4ac7_B72E_BC6C99FF3009" x="1412" y="91"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_61A7_4ac7_B72E_BC6C99FF3009" x="1423" y="91"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_61A7_4ac7_B72E_BC6C99FF3009" x="1423" y="91"/>
 			</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_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">
@@ -2539,16 +2515,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_61A7_4ac7_B8FF_34E21440DAD9" x="1332" y="81"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_61A7_4ac7_B8FF_34E21440DAD9" x="1332" y="81"/>
 			</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="1761" y="259"/>
 			</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">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_61A7_4ac7_99CE_63F041A42F06" text="+adms:identifier" modelElement="EAID_dstA2C83C_532C_460c_99CE_63F041A42F06">
@@ -2595,10 +2565,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="1761" 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="686"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_08CC4DDD_61A7_4ac7_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_61A7_4ac7_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
@@ -2616,7 +2585,7 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_61A7_4ac7_8018_10297955785C" x="1228" y="89"/>
 			</ownedElement>
 		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9" isFrame="false" modelElement="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2834,7 +2803,7 @@
 				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_55A5D1C5_EBDB_4ce5_AF0C_4249812776D9" isFrame="false" modelElement="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486">
 			<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"/>
@@ -2932,7 +2901,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_AEA24CC6_B487_46a9_9300_987D2CB956CC">
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_201DD477_AEE9_4497_8193_049F4E8303A5" isFrame="false" modelElement="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127">
 			<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"/>
@@ -2998,15 +2967,12 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEE9_4497_8372_75A07B6AB066" text="epo:Contract"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_8372_75A07B6AB066" x="641" y="771" width="216" height="98"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_201DD477_AEE9_4497_A1FD_8B5CA49C29AA" modelElement="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_A1FD_8B5CA49C29AA" x="1144" y="1204" width="115" height="110"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_201DD477_AEE9_4497_BCFD_D9808F73B52B" modelElement="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B">
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_BCFD_D9808F73B52B" x="202" y="1080" width="184" height="214"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_201DD477_AEE9_4497_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEE9_4497_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_B217_37E957B3B448" x="757" y="407" width="184" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AEE9_4497_B217_37E957B3B448" x="757" y="407" width="195" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_201DD477_AEE9_4497_98A8_802C2264F5DB" modelElement="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AEE9_4497_98A8_802C2264F5DB" text="epo-ord:OrderResponseInformation"/>
@@ -3111,18 +3077,17 @@
 				<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_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_AEE9_4497_B742_4DC2F5EAF55E" text="+epo-ord:hasPriceDiscountInformation" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B742_4DC2F5EAF55E" x="766" y="260" width="154" 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_B742_4DC2F5EAF55E" text="0..1" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B742_4DC2F5EAF55E" x="856" y="285" width="17" height="14"/>
+				<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_B742_4DC2F5EAF55E" x="1605" y="842"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B742_4DC2F5EAF55E" x="1910" y="842"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B742_4DC2F5EAF55E" x="1910" y="189"/>
-				<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"/>
+				<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>
 			<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">
@@ -3235,6 +3200,13 @@
 				<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_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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8070_7102E73439C9" x="955" y="487" width="135" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8070_7102E73439C9" x="1321" y="505"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8070_7102E73439C9" x="952" y="505"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_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_AEE9_4497_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8018_10297955785C" x="654" y="436" width="103" height="14"/>
@@ -3267,36 +3239,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8874_119FEFAF6080" x="386" y="1140"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8874_119FEFAF6080" x="575" y="1043"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_BA0A_CF9483F9B511" source="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" target="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" modelElement="EAID_55EE213D_C0F9_46f9_BA0A_CF9483F9B511">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_BA0A_CF9483F9B511" x="1144" y="1231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_BA0A_CF9483F9B511" x="759" y="1043"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_8B59_686C4B791FB8" source="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" target="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" modelElement="EAID_75E487DA_CCAA_441d_8B59_686C4B791FB8">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8B59_686C4B791FB8" x="1144" y="1258"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8B59_686C4B791FB8" x="1025" y="1257"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_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_AEE9_4497_B308_C0F08C743DCF" x="803" y="771"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B308_C0F08C743DCF" x="803" y="570"/>
-			</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>
-				<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_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>
-			<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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_8070_7102E73439C9" x="944" y="487" width="135" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_8070_7102E73439C9" x="1321" y="505"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_8070_7102E73439C9" x="941" y="505"/>
+				<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_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">
@@ -3319,19 +3264,32 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_A80A_3CDDD84D3629" x="1742" y="523"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_A80A_3CDDD84D3629" x="1567" y="523"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_201DD477_AEE9_4497_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_AEE9_4497_B742_4DC2F5EAF55E" text="+epo-ord:hasPriceDiscountInformation" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AEE9_4497_B742_4DC2F5EAF55E" x="766" y="260" width="154" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AEE9_4497_B742_4DC2F5EAF55E" text="0..1" modelElement="EAID_dstB1CFC6_0B95_4c94_B742_4DC2F5EAF55E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AEE9_4497_B742_4DC2F5EAF55E" x="856" y="285" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AEE9_4497_B742_4DC2F5EAF55E" x="1605" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B742_4DC2F5EAF55E" x="1910" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AEE9_4497_B742_4DC2F5EAF55E" x="1910" y="189"/>
+				<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="950" y="438" width="119" height="14"/>
+					<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="944" y="434" width="100" height="10"/>
+					<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="941" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AEE9_4497_B72E_BC6C99FF3009" x="941" y="468"/>
+				<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="941" y="429"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_AEE9_4497_B72E_BC6C99FF3009" x="941" 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>
 		</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">
@@ -3387,158 +3345,52 @@
 				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="1" ea_localid="210" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:25:21" modified="2023-07-17 18:25:21" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" xmi:type="uml:Class" name="epo-ord:TaxInformation" scope="public">
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-04-25 17:30:24" 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="order only"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2023-07-17 18:25:21" modified="2023-07-17 18:25:21"/>
-				<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_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" 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;"/>
-				<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_504EDC48_0B7F_4532_83B7_20456106C5AD" start="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" 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;"/>
-				<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_37004BE7_04CF_4073_8177_20D687239937" start="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="0" ea_localid="2851" ea_eleType="element"/>
-				<properties documentation="Needs to be aligned with eCatalogue in order to chose a codelist to be used." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-03-28 16:30:56" modified="2023-03-28 16:19:44" 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_645676C0_BCB7_41e3_9BA3_E4AE6841A773" start="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" end="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" 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;"/>
-				<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_F40A4DB7_3736_4264_87FA_6410FDD407CF" start="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" 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;"/>
-				<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_2902C23F_2D24_4d06_924C_BF1F30BDA6CD" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-					<NoteLink xmi:id="EAID_B6C50430_8249_4ddc_9657_EC6B3D521C37" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
-					<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="EAID_CC6B1D12_ADEE_42c9_87B4_F2A894F1683B" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="0" ea_localid="2046" ea_eleType="element"/>
-				<properties documentation="Primary roles:&#xA;Agents that are directly involved with the exchange of information.&#xA;Secondary roles: &#xA;Agents only mentioned in the documents but not really involved in the information manipulation &amp;amp; exchange. &#xA;Note: The context may change the roles primacy. &#xA;Note: There is a mixture of pre/post-award roles. Perhaps a distinction shall be done.&#xA;Note: Perhaps no role hierarchy is necessary.&#xA;&#xA;&#xA;&#xA;&#xA;&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-08-25 15:31:28" modified="2022-08-25 15:40:49" 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"/>
-			</element>
-			<element xmi:idref="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_4F2FFDAA_4997_465e_86A7_4D93C57094E2" package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="2" ea_localid="211" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:25:37" modified="2023-07-17 18:25: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="order only"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2023-07-17 18:25:37" modified="2023-07-17 18:25:37"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
-			</element>
-			<element xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" xmi:type="uml:Class" name="epo-ord:TaxInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" 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="2023-07-17 18:25:47" 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_28EB145B_8DD8_49b7_8986_81DD8F3654E4" name="epo-cat:hasPercentage" scope="Public">
-						<initial/>
-						<documentation value="The factor relative to the price charged in addition.&#xA;&#xA;WG approval 26/07/2022&#xA;"/>
-						<model ea_localid="2329" ea_guid="{28EB145B-8DD8-49b7-8986-81DD8F3654E4}"/>
-						<properties type="xsd:decimal" 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_573DEA29_FDB2_441a_98C2_1EDF890CF3DD" 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="2402" ea_guid="{573DEA29-FDB2-441a-98C2-1EDF890CF3DD}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
-						<stereotype/>
-						<bounds lower="1" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
+				<attributes>
+					<attribute xmi:idref="EAID_28EB145B_8DD8_49b7_8986_81DD8F3654E4" name="epo-cat:hasPercentage" scope="Public">
+						<initial/>
+						<documentation value="The factor relative to the price charged in addition.&#xA;&#xA;WG approval 26/07/2022&#xA;"/>
+						<model ea_localid="2329" ea_guid="{28EB145B-8DD8-49b7-8986-81DD8F3654E4}"/>
+						<properties type="xsd:decimal" 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_573DEA29_FDB2_441a_98C2_1EDF890CF3DD" 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="2402" ea_guid="{573DEA29-FDB2-441a-98C2-1EDF890CF3DD}"/>
+						<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_0D4101FD_7720_417c_B62C_6F674CDB3888" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_4EB6E847_DCFA_421e_AAE9_7F444FFEA26A"/>
 					<Association xmi:id="EAID_470D1B16_C07B_4868_91B2_799578663395" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
 					<Dependency xmi:id="EAID_4D92CD55_08CD_4d21_806C_38F93CA90719" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_33A89700_846B_47cb_93D9_9D4729194EA6"/>
 					<Association xmi:id="EAID_87123434_C2AD_43de_925D_13E9A7667A18" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Dependency xmi:id="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D" start="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4" end="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25"/>
 					<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"/>
@@ -3546,14 +3398,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843" xmi:type="uml:Class" name="epo-ord:DeliveryAgreement" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2786" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-03-08 14:00:57" modified="2023-05-16 17:06: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="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<attributes>
 					<attribute xmi:idref="EAID_02A5E1CD_6E25_4ae3_A76B_B552B9987D94" name="dct:description" scope="Public">
 						<initial/>
@@ -3578,14 +3430,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" xmi:type="uml:Class" name="epo-ord:OriginatorInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2362" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-12-02 17:13:32" modified="2023-04-20 16:58: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Generalization xmi:id="EAID_014949B1_BE8E_4bef_8E6B_98E657488D49" start="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
 					<Association xmi:id="EAID_74A55DED_4624_43a3_8FA7_D8F2D6516D40" start="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
@@ -3595,14 +3447,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" xmi:type="uml:Class" name="epo-ord:ContractInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2360" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:46" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-12-01 16:09:27" modified="2023-04-20 16:51: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="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Association xmi:id="EAID_16C34048_F5E0_4885_8D46_5814F76AE356" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
 					<Generalization xmi:id="EAID_A76AAA3D_FA92_46df_8905_FDFE3A9A6323" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
@@ -3611,14 +3463,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A" xmi:type="uml:Class" name="epo-ord:DeliveryInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2087" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-06 15:55:46" modified="2023-05-16 17:16: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="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<attributes>
 					<attribute xmi:idref="EAID_289C1955_4486_4bfc_A2A2_11B9317C4CEA" name="epo-ord:hasShippingMark" scope="Public">
 						<initial/>
@@ -3665,14 +3517,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_DB9BDB18_C14B_4262_AAE5_65D2B64C35E1" xmi:type="uml:Class" name="epo-ord:AllowanceChargeInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2041" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:46" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:55:21" modified="2023-05-16 17:16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<attributes>
 					<attribute xmi:idref="EAID_44E5CE57_12D3_4013_8F09_B434DAB0D6BA" name="epo-cat:hasPercentage" scope="Public">
 						<initial/>
@@ -3716,14 +3568,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" xmi:type="uml:Class" name="epo-ord:AllowanceInformation" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2040" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:46" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-24 16:53:48" modified="2023-05-16 17:10:05" 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"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<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"/>
@@ -3732,14 +3584,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" xmi:type="uml:Class" name="epo-ord:OrderLine" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2037" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-16 14:42:45" modified="2023-04-20 16:35: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="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Association xmi:id="EAID_082B76C7_EF6B_4c76_8A07_9FF99AC0CF07" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_28F811B2_B8F5_4649_8793_87E238D6811B"/>
 					<Association xmi:id="EAID_0AC5D04E_7364_4118_9D94_CE93A68B3CF9" start="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
@@ -3757,14 +3609,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" xmi:type="uml:Class" name="epo-ord:Seller" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2018" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-11 12:59:20" modified="2023-04-25 17:06: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Generalization xmi:id="EAID_A88E2729_62D9_493c_8105_4D93D49DFA8A" start="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					<Association xmi:id="EAID_06DB4B0B_7B20_475e_895E_9E7177239DE8" start="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
@@ -3775,14 +3627,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" xmi:type="uml:Class" name="epo-ord:Consignee" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2028" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:46" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-08-11 15:53:11" modified="2023-04-24 01:04: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Generalization xmi:id="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" start="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					<NoteLink xmi:id="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD" start="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
@@ -3792,14 +3644,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" xmi:type="uml:Class" name="epo-ord:Order" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2010" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 16:12:29" modified="2023-04-20 16:19:34" 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"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<attributes>
 					<attribute xmi:idref="EAID_136FF2A2_5E7E_4f6b_88CC_0465F90D5A77" name="epo-ord:hasCustomerReference" scope="Public">
 						<initial/>
@@ -3873,14 +3725,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" xmi:type="uml:Class" name="epo-ord:Originator" scope="public">
-				<model package="EAPK_4F2FFDAA_4997_465e_86A7_4D93C57094E2" tpos="0" ea_localid="2004" ea_eleType="element"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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="2023-07-17 18:25:47" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-08-10 15:27:32" modified="2023-03-20 18:21:05" 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"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
 					<Generalization xmi:id="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" start="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					<NoteLink xmi:id="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5" start="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
@@ -3889,169 +3741,83 @@
 					<NoteLink xmi:id="EAID_F40A4DB7_3736_4264_87FA_6410FDD407CF" start="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" xmi:type="uml:Package" name="order response" scope="public">
-				<model package2="EAID_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" package="EAPK_E2C29545_D1F9_4f95_9A73_D4C5237825DE" tpos="2" ea_localid="168" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-12-02 17:23:33" modified="2022-12-02 17:23:33" 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="Ordering"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<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_AEA24CC6_B487_46a9_9300_987D2CB956CC" xmi:type="uml:Package" name="diagrams" scope="public">
-				<model package2="EAID_AEA24CC6_B487_46a9_9300_987D2CB956CC" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="1" ea_localid="213" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:26:30" modified="2023-07-17 18:26: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="order response"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2023-07-17 18:26:30" modified="2023-07-17 18:26:30"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
-			</element>
-			<element xmi:idref="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_AEA24CC6_B487_46a9_9300_987D2CB956CC" tpos="0" ea_localid="2063" ea_eleType="element"/>
-				<properties documentation="Should we conceive that an order line is included in the Order Reponse? &#xA;&#xA;https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1229/" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-09-05 12:14:21" modified="2022-09-05 12:15:02" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
-					<NoteLink xmi:id="EAID_55EE213D_C0F9_46f9_BA0A_CF9483F9B511" start="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" end="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-					<NoteLink xmi:id="EAID_75E487DA_CCAA_441d_8B59_686C4B791FB8" start="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" end="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
+					<NoteLink xmi:id="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD" start="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_AEA24CC6_B487_46a9_9300_987D2CB956CC" 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 (instanciate) 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="2022-09-05 11:26:50" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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;"/>
 				<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_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_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="2" ea_localid="212" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:26:10" modified="2023-07-17 18:26: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="order response"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2023-07-17 18:26:10" modified="2023-07-17 18:26:10"/>
-				<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_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" 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="2023-07-17 18:26: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_4B7CCAB3_628F_41fd_A787_5AF33D50812B" name="epo-ord:hasResponseDescription" scope="Public">
-						<initial/>
-						<documentation value="Response clarification of the Supplier decision. "/>
-						<model ea_localid="2106" ea_guid="{4B7CCAB3-628F-41fd-A787-5AF33D50812B}"/>
-						<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>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
-					<Association xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-					<Association xmi:id="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-					<Association xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
-					<Association xmi:id="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
-					<Association xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Association xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Generalization xmi:id="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
-					<NoteLink xmi:id="EAID_55EE213D_C0F9_46f9_BA0A_CF9483F9B511" start="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" end="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
-					<NoteLink xmi:id="EAID_C2D6205A_51AB_4613_8874_119FEFAF6080" start="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" end="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					<NoteLink xmi:id="EAID_37004BE7_04CF_4073_8177_20D687239937" start="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499" end="EAID_C3684D7C_E07D_415a_B935_B52376928738"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" xmi:type="uml:Class" name="epo-ord:OrderResponseInformation" scope="public">
-				<model package="EAPK_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" 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="2023-07-17 18:26:21" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
-					<Generalization xmi:id="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
-					<Association xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-					<Association xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Dependency xmi:id="EAID_9898A4B0_1319_468d_ACED_450943028D41" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
-					<Association xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+					<NoteLink xmi:id="EAID_F40A4DB7_3736_4264_87FA_6410FDD407CF" start="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" xmi:type="uml:Class" name="epo-ord:OrderResponseLine" scope="public">
-				<model package="EAPK_EC89BFFA_F1AD_4ca3_9F81_72C163E6D2CC" 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="2023-07-17 18:26:21" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="order only"/>
 				<links>
-					<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_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96" start="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
-					<Association xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
-					<Association xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
+					<NoteLink xmi:id="EAID_2902C23F_2D24_4d06_924C_BF1F30BDA6CD" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+					<NoteLink xmi:id="EAID_B6C50430_8249_4ddc_9657_EC6B3D521C37" start="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
+					<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_C1739D82_10E9_4721_BCE7_0F75EBD5D612" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
-				<model package2="EAID_C1739D82_10E9_4721_BCE7_0F75EBD5D612" package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="3" ea_localid="214" ea_eleType="package"/>
+			<element xmi:idref="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" xmi:type="uml:Package" name="order response" scope="public">
+				<model package2="EAID_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" package="EAPK_E2C29545_D1F9_4f95_9A73_D4C5237825DE" tpos="2" ea_localid="168" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:26:43" modified="2023-07-17 18:26:43" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-12-02 17:23:33" modified="2022-12-02 17:23:33" 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="order response"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<extendedProperties tagged="0" package_name="Ordering"/>
+				<packageproperties version="1.0" tpos="2"/>
 				<paths/>
-				<times created="2023-07-17 18:26:43" modified="2023-07-17 18:26:43"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<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="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" xmi:type="uml:Enumeration" name="at-voc-new:ResponseStatus" scope="public">
-				<model package="EAPK_C1739D82_10E9_4721_BCE7_0F75EBD5D612" tpos="0" ea_localid="2069" 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-09-05 11:16:19" modified="2023-07-17 18:26:46" complexity="1" status="Proposed"/>
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" tpos="0" ea_localid="2069" ea_eleType="element"/>
+				<properties documentation="https://docs.peppol.eu/poacc/upgrade-3/codelist/UNCL1229/&#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="2023-09-11 18:14: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="controlled vocabularies"/>
+				<extendedProperties tagged="0" package_name="order response"/>
 				<attributes>
 					<attribute xmi:idref="EAID_EADCE343_CBD4_4bd5_92AD_3F07BE4ACCBE" name="Accepted" scope="Public">
 						<initial/>
@@ -4130,334 +3896,178 @@
 					</attribute>
 				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_75E487DA_CCAA_441d_8B59_686C4B791FB8" start="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" end="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
 					<Dependency xmi:id="EAID_9898A4B0_1319_468d_ACED_450943028D41" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" xmi:type="uml:Package" name="datatype" scope="public">
-				<model package2="EAID_DC89455D_7112_440b_86BC_EA47E188896D" package="EAPK_E2C29545_D1F9_4f95_9A73_D4C5237825DE" tpos="3" ea_localid="171" 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"/>
+			<element xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" xmi:type="uml:Class" name="epo-ord:OrderResponseLine" scope="public">
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" 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="2023-04-20 16:48: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="Ordering"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
+				<extendedProperties tagged="0" package_name="order response"/>
+				<links>
+					<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_B2F5C9AF_E278_4ca2_80B9_C8B85FBF7E96" start="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" end="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A"/>
+					<Association xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
+					<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="EAID_D42FB6E9_F89B_4355_977D_7F730AC71F80" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2373" 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:42:57" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" xmi:type="uml:Class" name="epo-ord:OrderResponseInformation" scope="public">
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" 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="2023-07-14 13:36: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="datatype"/>
+				<extendedProperties tagged="0" package_name="order response"/>
+				<links>
+					<Generalization xmi:id="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A"/>
+					<Association xmi:id="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
+					<Association xmi:id="EAID_89C3F218_90EF_42ed_B918_7EEB88718C50" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Dependency xmi:id="EAID_9898A4B0_1319_468d_ACED_450943028D41" start="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" end="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125"/>
+					<Association xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_BED37B79_C2FD_4ae2_9D60_1BBC5BCC1595" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2368" 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_CC6F873E_58BA_4341_AB3C_08A88C45196D" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2367" 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"/>
+			<element xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" xmi:type="uml:Class" name="epo-ord:OrderResponse" scope="public">
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" 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="2023-04-20 16:41: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
+				<extendedProperties tagged="0" package_name="order response"/>
+				<attributes>
+					<attribute xmi:idref="EAID_4B7CCAB3_628F_41fd_A787_5AF33D50812B" name="epo-ord:hasResponseDescription" scope="Public">
+						<initial/>
+						<documentation value="Response clarification of the Supplier decision. "/>
+						<model ea_localid="2106" ea_guid="{4B7CCAB3-628F-41fd-A787-5AF33D50812B}"/>
+						<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>
+					<Association xmi:id="EAID_13CF78D6_E061_467c_8F33_D45D96E7471E" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_F655321A_F106_46f3_933E_53ADDFD9113B"/>
+					<Association xmi:id="EAID_AFC00307_2C3C_43a2_91E7_AA8247B7CEDD" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					<Association xmi:id="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB"/>
+					<Association xmi:id="EAID_F0AC5841_AE12_4b29_9A54_29BA5C9C4A38" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01"/>
+					<Association xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Generalization xmi:id="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B"/>
+					<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="EAID_C1426210_D360_4e20_B65B_C5CA2EBA5BD6" xmi:type="uml:DataType" name="xsd:date" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2369" 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"/>
+			<element xmi:idref="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" 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;"/>
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="datatype"/>
+				<extendedProperties tagged="0" package_name="order response"/>
+				<links>
+					<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="EAID_036B7029_80AD_4ac5_A37D_1C3DB65E379A" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2370" 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"/>
+			<element xmi:idref="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" xmi:type="uml:Package" name="datatype" scope="public">
+				<model package2="EAID_DC89455D_7112_440b_86BC_EA47E188896D" package="EAPK_E2C29545_D1F9_4f95_9A73_D4C5237825DE" tpos="3" ea_localid="171" 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="datatype"/>
+				<extendedProperties tagged="0" package_name="Ordering"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2022-04-29 20:18:28" modified="2022-04-29 20:24:39" lastloaddate="2022-12-15 13:34:24" lastsavedate="2022-12-15 13:34:24"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" batchsave="0" batchload="0" usedtd="FALSE" logxml="FALSE" packageFlags="isModel=1;VICON=3;"/>
 			</element>
-			<element xmi:idref="EAID_DB4F942D_139A_410a_A71D_05C954F91125" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2372" ea_eleType="element"/>
+			<element xmi:idref="EAID_D42FB6E9_F89B_4355_977D_7F730AC71F80" xmi:type="uml:DataType" name="rdf:PlainLiteral" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2373" 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"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-29 20:26:11" modified="2023-03-12 13:42: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_DD30645A_3A1A_40ab_BAE1_A2CE1366635F" xmi:type="uml:DataType" name="xsd:integer" scope="public">
-				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2371" ea_eleType="element"/>
+			<element xmi:idref="EAID_BED37B79_C2FD_4ae2_9D60_1BBC5BCC1595" xmi:type="uml:DataType" name="xsd:anyURI" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2368" 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"/>
+				<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>
-		</elements>
-		<connectors>
-			<connector xmi:idref="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD">
-				<source xmi:idref="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5">
-					<model ea_localid="2042" 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_CCACD9C3_0F25_4839_844D_DCAF96861695">
-					<model ea_localid="2028" type="Class" name="epo-ord:Consignee"/>
-					<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="3295"/>
-				<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_37004BE7_04CF_4073_8177_20D687239937">
-				<source xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499">
-					<model ea_localid="2633" 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_C3684D7C_E07D_415a_B935_B52376928738">
-					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="4073"/>
-				<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_645676C0_BCB7_41e3_9BA3_E4AE6841A773">
-				<source xmi:idref="EAID_38C2E543_06D2_464d_8539_9D1E0635944C">
-					<model ea_localid="2851" 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_8FD3F177_8104_4fde_AA65_095BEC507C12">
-					<model ea_localid="1638" type="Enumeration" name="at-voc-new:item-classification"/>
-					<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="4368"/>
-				<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_F40A4DB7_3736_4264_87FA_6410FDD407CF">
-				<source xmi:idref="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3">
-					<model ea_localid="2043" 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_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
-					<model ea_localid="2004" type="Class" name="epo-ord:Originator"/>
-					<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="3296"/>
-				<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_2902C23F_2D24_4d06_924C_BF1F30BDA6CD">
-				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
-					<model ea_localid="2053" 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_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="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3309"/>
-				<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_B6C50430_8249_4ddc_9657_EC6B3D521C37">
-				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
-					<model ea_localid="2053" 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_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/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3310"/>
-				<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/>
+				<tags/>
 				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_CC6F873E_58BA_4341_AB3C_08A88C45196D" xmi:type="uml:DataType" name="xsd:boolean" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2367" 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_C1426210_D360_4e20_B65B_C5CA2EBA5BD6" xmi:type="uml:DataType" name="xsd:date" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2369" 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/>
-			</connector>
-			<connector xmi:idref="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB">
-				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
-					<model ea_localid="2053" type="Note"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
-					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3338"/>
-				<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/>
-				<style/>
 				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_036B7029_80AD_4ac5_A37D_1C3DB65E379A" xmi:type="uml:DataType" name="xsd:dateTime" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2370" 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>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="datatype"/>
+			</element>
+			<element xmi:idref="EAID_DB4F942D_139A_410a_A71D_05C954F91125" xmi:type="uml:DataType" name="xsd:decimal" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2372" 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_DD30645A_3A1A_40ab_BAE1_A2CE1366635F" xmi:type="uml:DataType" name="xsd:integer" scope="public">
+				<model package="EAPK_DC89455D_7112_440b_86BC_EA47E188896D" tpos="0" ea_localid="2371" 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_0D4101FD_7720_417c_B62C_6F674CDB3888">
 				<source xmi:idref="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4">
 					<model ea_localid="2818" type="Class" name="epo-ord:TaxInformation"/>
@@ -4594,39 +4204,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E3FDDB0F_21B9_4ac6_BA3F_75F7BC4A203D">
-				<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="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_A6F1CC71_A34A_4ba2_A45F_8DB7D4491E25">
-					<model ea_localid="1527" type="Enumeration" name="at-voc-new:vat-category"/>
-					<role name="epo-cat:hasVATCategory" 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="2643"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Value-added tax category of the item.&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasVATCategory"/>
-				<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"/>
@@ -4711,7 +4288,7 @@
 				<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="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;"/>
@@ -4725,7 +4302,7 @@
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ord:hasTaxInformation"/>
+				<labels rb="0..*" rt="+epo-ord:hasTaxInformation"/>
 				<extendedProperties/>
 				<style/>
 				<xrefs/>
@@ -6155,6 +5732,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_2902C23F_2D24_4d06_924C_BF1F30BDA6CD">
+				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
+					<model ea_localid="2053" 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_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="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3309"/>
+				<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_6089809C_E481_4fb3_9090_B37DC376C605">
 				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
 					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
@@ -6294,6 +5905,40 @@
 				<xrefs/>
 				<tags/>
 			</connector>
+			<connector xmi:idref="EAID_504EDC48_0B7F_4532_83B7_20456106C5AD">
+				<source xmi:idref="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5">
+					<model ea_localid="2042" 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_CCACD9C3_0F25_4839_844D_DCAF96861695">
+					<model ea_localid="2028" type="Class" name="epo-ord:Consignee"/>
+					<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="3295"/>
+				<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_850FB781_6BCF_46e3_A7FC_2B4BAC3C8DBD">
 				<source xmi:idref="EAID_05A42455_86E9_49a9_98CF_6753815E5C67">
 					<model ea_localid="2116" type="Class" name="epo-ful:DespatchAdvice"/>
@@ -7025,43 +6670,111 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55EE213D_C0F9_46f9_BA0A_CF9483F9B511">
-				<source xmi:idref="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA">
-					<model ea_localid="2063" type="Note"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_F40A4DB7_3736_4264_87FA_6410FDD407CF">
+				<source xmi:idref="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3">
+					<model ea_localid="2043" 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_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
+					<model ea_localid="2004" type="Class" name="epo-ord:Originator"/>
+					<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="3296"/>
+				<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_37004BE7_04CF_4073_8177_20D687239937">
+				<source xmi:idref="EAID_2692AC99_7B59_4a2a_9D1B_6ECD3CC99499">
+					<model ea_localid="2633" 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_C3684D7C_E07D_415a_B935_B52376928738">
+					<model ea_localid="2201" type="Enumeration" name="at-voc-new:document-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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4073"/>
+				<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_B6C50430_8249_4ddc_9657_EC6B3D521C37">
+				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
+					<model ea_localid="2053" type="Note"/>
+					<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_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+				<target 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/>
 					<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="3326"/>
+				<model ea_localid="3310"/>
 				<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/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_75E487DA_CCAA_441d_8B59_686C4B791FB8">
-				<source xmi:idref="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA">
-					<model ea_localid="2063" type="Note"/>
+			<connector xmi:idref="EAID_DA29E13C_0424_4173_A5A2_DD96859DF5FB">
+				<source xmi:idref="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444">
+					<model ea_localid="2053" type="Note"/>
 					<role visibility="Public"/>
 					<type aggregation="none"/>
 					<constraints/>
@@ -7071,8 +6784,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125">
-					<model ea_localid="2069" type="Enumeration" name="at-voc-new:ResponseStatus"/>
+				<target xmi:idref="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD">
+					<model ea_localid="1605" type="Class" name="epo-cat:Manufacturer"/>
 					<role visibility="Public"/>
 					<type aggregation="none"/>
 					<constraints/>
@@ -7082,7 +6795,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3325"/>
+				<model ea_localid="3338"/>
 				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
@@ -7093,35 +6806,34 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C2D6205A_51AB_4613_8874_119FEFAF6080">
-				<source xmi:idref="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B">
-					<model ea_localid="2013" type="Note"/>
+			<connector xmi:idref="EAID_9898A4B0_1319_468d_ACED_450943028D41">
+				<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/>
 					<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_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125">
+					<model ea_localid="2069" type="Enumeration" name="at-voc-new:ResponseStatus"/>
+					<role name="epo-ord:hasAcceptanceStatus" 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="3260"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4764"/>
+				<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="1" rt="+epo-ord:hasAcceptanceStatus"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7162,9 +6874,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
-				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+			<connector xmi:idref="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
+				<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/>
@@ -7174,9 +6886,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
-					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
-					<role name="epo-ord:specifiesOrderResponseInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B">
+					<model ea_localid="2065" type="Class" name="epo-ord:OrderResponseLine"/>
+					<role name="epo-ord:isSpecificToOrderResponseLine" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -7185,56 +6897,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4761"/>
+				<model ea_localid="4762"/>
 				<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:specifiesOrderResponseInformation"/>
+				<labels rb="0..*" rt="+epo-ord:isSpecificToOrderResponseLine"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
-				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<connector xmi:idref="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789">
+				<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/>
 					<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_96B284C4_E759_4bad_9655_04521F703750">
-					<model ea_localid="857" type="Class" name="epo:Buyer"/>
-					<role name="epo-ord:specifiesBuyer" visibility="Public"/>
-					<type multiplicity="0..1" aggregation="none"/>
+				<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="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="3322"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4765"/>
+				<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:specifiesBuyer"/>
-				<extendedProperties/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+			<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/>
@@ -7244,9 +6955,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo-ord:implementsContract" 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"/>
@@ -7255,89 +6966,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3259"/>
+				<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-ord:implementsContract"/>
+				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F3DC6C10_C71E_4d6a_8E54_05CFB346E654">
+			<connector xmi:idref="EAID_ECF97AE3_C138_47de_9B92_F1BE4B376642">
 				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
 					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
 					<role visibility="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_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"/>
+				<target xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
+					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
+					<role name="epo-ord:specifiesOrderResponseInformation" 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="4565"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4761"/>
+				<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:specifiesOrderResponseInformation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1B6003C0_D0B7_432f_8EA3_408BD2086789">
-				<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"/>
+			<connector xmi:idref="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
+				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+					<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;Navigable=Non-Navigable;Owned=0;Union=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"/>
+				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+					<role name="epo-ord:specifiesBuyer" visibility="Public"/>
+					<type multiplicity="0..1" aggregation="none"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<style value="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4765"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3322"/>
+				<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/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+epo-ord:specifiesBuyer"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_41B39003_2ED7_40e3_B01B_D11FF794AF2B">
-				<source xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
-					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
+			<connector xmi:idref="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -7347,10 +7060,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F655321A_F106_46f3_933E_53ADDFD9113B">
-					<model ea_localid="2065" type="Class" name="epo-ord:OrderResponseLine"/>
-					<role name="epo-ord:isSpecificToOrderResponseLine" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo-ord:implementsContract" 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;"/>
@@ -7358,81 +7071,81 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4762"/>
+				<model ea_localid="3259"/>
 				<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:isSpecificToOrderResponseLine"/>
+				<labels rb="0..1" rt="+epo-ord:implementsContract"/>
 				<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_F3DC6C10_C71E_4d6a_8E54_05CFB346E654">
+				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4763"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4565"/>
+				<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:hasDeliveryPeriod"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9898A4B0_1319_468d_ACED_450943028D41">
-				<source xmi:idref="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB">
-					<model ea_localid="3096" type="Class" name="epo-ord:OrderResponseInformation"/>
+			<connector xmi:idref="EAID_C2D6205A_51AB_4613_8874_119FEFAF6080">
+				<source xmi:idref="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B">
+					<model ea_localid="2013" 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_1E0B8798_161F_491d_ADC5_9FD206CC6125">
-					<model ea_localid="2069" type="Enumeration" name="at-voc-new:ResponseStatus"/>
-					<role name="epo-ord:hasAcceptanceStatus" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+					<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="4764"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="3260"/>
+				<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-ord:hasAcceptanceStatus"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -7452,27 +7165,26 @@
 		<profiles/>
 		<diagrams>
 			<diagram xmi:id="EAID_C451B2CC_DD71_461f_8B8E_B08F284A9D7E">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="360" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="3"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="360" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="3"/>
 				<properties name="order roles hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-08-11 15:39:58" modified="2023-06-01 11:07:04"/>
+				<project author="lps" version="1.0" created="2022-08-11 15:39:58" modified="2023-09-11 18:13: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=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=FBB8976E;"/>
+				<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;"/>
 				<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=983;Top=685;Right=1079;Bottom=755;" 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=394;Top=533;Right=509;Bottom=603;" 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=407;Top=685;Right=497;Bottom=755;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="3" style="DUID=A5BD283E;"/>
-					<element geometry="Left=51;Top=375;Right=322;Bottom=524;" subject="EAID_CC6B1D12_ADEE_42c9_87B4_F2A894F1683B" seqno="4" style="DUID=291AB611;"/>
-					<element geometry="Left=929;Top=821;Right=1136;Bottom=1008;" subject="EAID_BF2913A1_0BAC_4346_887E_3D02A662D444" seqno="5" style="DUID=EAD26001;"/>
-					<element geometry="Left=568;Top=685;Right=658;Bottom=755;" 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=73;Top=670;Right=301;Bottom=771;" 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=850;Top=685;Right=946;Bottom=755;" 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=974;Top=533;Right=1089;Bottom=603;" 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=1122;Top=685;Right=1218;Bottom=755;" 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=555;Top=821;Right=670;Bottom=876;" subject="EAID_4CD6F72F_C895_4f45_A897_6A3BE5805EC3" seqno="11" style="DUID=B4DBC56E;"/>
-					<element geometry="Left=395;Top=806;Right=510;Bottom=861;" subject="EAID_151E333E_CEC7_4c28_B222_35A41469D7C5" seqno="12" style="DUID=B9437A32;"/>
+					<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="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=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;"/>
@@ -7487,7 +7199,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_22250BDC_AC99_495d_9AAD_3A4E9486D937">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="361" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="1"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="361" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="1"/>
 				<properties name="order" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-08-24 16:12:01" modified="2023-07-17 17:31: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=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;"/>
@@ -7626,7 +7338,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_000A8819_EDF3_4cb3_9B22_BB629B0F2EBD">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="371" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="5"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="371" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="5"/>
 				<properties name="order information hubs" type="Logical"/>
 				<project author="lps" version="1.0" created="2022-12-01 16:09:04" modified="2023-07-14 11:54: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=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;"/>
@@ -7693,7 +7405,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_FC3EFF3F_9A22_4a45_83B7_8A32BC22CFBE">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="425" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="8"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="425" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="8"/>
 				<properties name="order invoicee" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-20 18:21:19" modified="2023-06-01 10:43: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=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;"/>
@@ -7723,7 +7435,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_04F29F40_7172_4127_9D37_0EBF552EA455">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="431" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="9"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="431" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="9"/>
 				<properties name="order total amounts" type="Logical"/>
 				<project author="andreea" version="1.0" created="2023-03-23 16:38:04" modified="2023-06-01 10:58: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;"/>
@@ -7745,11 +7457,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E459BBE2_E929_4cb0_B4F7_6ABD198FEF62">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="432" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="6"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="432" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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-06-01 10:41:38"/>
+				<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;"/>
-				<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=A84E2A67;"/>
+				<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=180DE800;"/>
 				<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/>
@@ -7763,7 +7475,7 @@
 					<element geometry="Left=260;Top=445;Right=415;Bottom=499;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="7" style="DUID=AE01037D;NSL=0;"/>
 					<element geometry="Left=757;Top=264;Right=1024;Bottom=362;" 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=FE0961F4;"/>
 					<element geometry="SX=-37;SY=-2;EX=-37;EY=-2;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=FE0961F4;SOID=15F91890;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=47: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_87123434_C2AD_43de_925D_13E9A7667A18" style="Mode=3;EOID=FE0961F4;SOID=15F91890;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=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=FE0961F4;SOID=15F91890;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-60;SY=0;EX=0;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=39:OY=18: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=5945F6DD;SOID=15F91890;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=17;SY=-1;EX=15;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=48: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=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=7AE46968;SOID=15F91890;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=85;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=532:-177$;" subject="EAID_2EEE05CA_6A1E_4946_A54F_BC6967C07ADF" style="Mode=3;EOID=15F91890;SOID=6FB6FDB2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -7775,11 +7487,11 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_08CC4DDD_61A7_4ac7_8591_C19830AD66DB">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="436" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="2"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="436" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" tpos="2"/>
 				<properties name="order line" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-03-28 16:30:46" modified="2023-06-27 12:11:53"/>
+				<project author="andreea" version="1.0" created="2023-03-28 16:30:46" modified="2023-09-11 18:03: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=B9DACF84;"/>
+				<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=5E0AD178;"/>
 				<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/>
@@ -7790,24 +7502,23 @@
 					<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=1761;Top=384;Right=1851;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=1761;Top=228;Right=1851;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=1783;Top=535;Right=1898;Bottom=602;" subject="EAID_38C2E543_06D2_464d_8539_9D1E0635944C" seqno="7" style="DUID=20008945;ImageID=0;"/>
-					<element geometry="Left=1612;Top=539;Right=1702;Bottom=599;" subject="EAID_8FD3F177_8104_4fde_AA65_095BEC507C12" 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=A6676228;"/>
-					<element geometry="Left=1228;Top=81;Right=1412;Bottom=244;" 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=93433B5A;"/>
-					<element geometry="Left=91;Top=768;Right=330;Bottom=853;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" 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=2089BE1C;"/>
-					<element geometry="Left=902;Top=748;Right=1210;Bottom=872;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" 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=FBE8BC48;"/>
-					<element geometry="Left=475;Top=776;Right=659;Bottom=846;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="12" style="NSL=0;DUID=1CD191BF;"/>
-					<element geometry="Left=636;Top=94;Right=920;Bottom=231;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" 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=35F1ADB6;"/>
-					<element geometry="Left=1166;Top=454;Right=1412;Bottom=686;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" seqno="14" style="NSL=0;DUID=FE41CC0C;"/>
-					<element geometry="Left=482;Top=626;Right=653;Bottom=686;" subject="EAID_11868688_75E4_42f8_9313_58C4BB4EB1A7" seqno="15" style="NSL=0;DUID=56D2D6CC;"/>
+					<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;"/>
+					<element geometry="Left=1228;Top=81;Right=1423;Bottom=244;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" 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=93433B5A;"/>
+					<element geometry="Left=91;Top=768;Right=330;Bottom=853;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" 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=2089BE1C;"/>
+					<element geometry="Left=902;Top=748;Right=1210;Bottom=872;" 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=FBE8BC48;"/>
+					<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="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=-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;"/>
@@ -7820,22 +7531,21 @@
 					<element geometry="EDGE=1;SX=-17;SY=0;EX=0;EY=-60;$LLB=;LLT=;LMT=;LMB=;LRT=CX=69: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1044:-222$;" subject="EAID_ACCA405B_7FF7_41ad_9ACB_A1015C643C97" style="Mode=3;EOID=35F1ADB6;SOID=747250D5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-20;SY=0;EX=0;EY=68;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=-9:OY=-6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6:CY=14:OX=7:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1041:-502$;" subject="EAID_65A0DAC3_2E18_40c1_BB08_B80EA400868A" style="Mode=3;EOID=FE41CC0C;SOID=747250D5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<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="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_645676C0_BCB7_41e3_9BA3_E4AE6841A773" style="Mode=3;EOID=A6676228;SOID=20008945;Color=-1;LWidth=0;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=1412:-125$1440:-125$1440:-91$1412:-91$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" 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="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="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="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;"/>
-					<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=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="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="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=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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_10A1F3B5_0417_4962_B616_A04C2DECC0B9">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="443" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="7"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="443" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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"/>
 				<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;"/>
@@ -7885,7 +7595,7 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_55A5D1C5_EBDB_4ce5_AF0C_4249812776D9">
-				<model package="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" localID="466" owner="EAPK_CD435DF8_6CA8_4500_9465_7F9A1BBAB16C" tpos="4"/>
+				<model package="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" localID="466" owner="EAPK_B2290C27_263F_4b18_8490_9BE57A4A1486" 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;"/>
@@ -7918,37 +7628,35 @@
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_201DD477_AEE9_4497_8193_049F4E8303A5">
-				<model package="EAPK_AEA24CC6_B487_46a9_9300_987D2CB956CC" localID="375" owner="EAPK_AEA24CC6_B487_46a9_9300_987D2CB956CC"/>
+				<model package="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127" localID="375" owner="EAPK_44147FFC_CE0D_4cb8_94F5_0B4C7BAF6127"/>
 				<properties name="order response" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-12-15 14:54:41" modified="2023-07-14 13:39:56"/>
+				<project author="lps" version="1.0" created="2022-12-15 14:54:41" modified="2023-09-11 18:15: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=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=70B5B455;"/>
+				<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;"/>
 				<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=573;Top=1109;Right=760;Bottom=1155;" subject="EAID_109E936B_4B55_43d3_98A8_802C2264F5DB" seqno="1" style="DUID=9EBF25D8;"/>
-					<element geometry="Left=757;Top=407;Right=941;Bottom=570;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="2" style="DUID=15959C54;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=757;Top=407;Right=952;Bottom=570;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="2" style="DUID=15959C54;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=202;Top=1080;Right=386;Bottom=1294;" subject="EAID_D7E32546_10E8_48f1_BCFD_D9808F73B52B" seqno="3" style="DUID=CA391782;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1144;Top=1204;Right=1259;Bottom=1314;" subject="EAID_43D03083_8122_4e70_A1FD_8B5CA49C29AA" seqno="4" style="DUID=D72CC01B;NSL=0;BCol=-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=771;Right=857;Bottom=869;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="5" style="DUID=9D5FAD98;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=215;Top=483;Right=305;Bottom=553;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="6" style="DUID=DA6D8719;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=133;Top=604;Right=352;Bottom=689;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="7" style="DUID=58B7DA6A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1321;Top=311;Right=1629;Bottom=435;" 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=3483CF6A;"/>
-					<element geometry="Left=1321;Top=447;Right=1567;Bottom=587;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" 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=B82062F1;"/>
-					<element geometry="Left=1273;Top=684;Right=1498;Bottom=754;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" 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=EA1C4C23;"/>
-					<element geometry="Left=1641;Top=674;Right=1860;Bottom=764;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="11" style="NSL=0;DUID=8FEE6E8B;"/>
-					<element geometry="Left=1415;Top=793;Right=1605;Bottom=847;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="12" style="NSL=0;DUID=F301CE71;"/>
-					<element geometry="Left=1049;Top=216;Right=1203;Bottom=277;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="13" style="NSL=0;DUID=8BC8ABCD;"/>
-					<element geometry="Left=771;Top=303;Right=925;Bottom=357;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="14" style="DUID=E3CC8F4E;NSL=0;"/>
-					<element geometry="Left=545;Top=951;Right=788;Bottom=1043;" subject="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" seqno="15" style="DUID=E42F2F52;NSL=0;BCol=-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=1215;Right=754;Bottom=1300;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="16" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=CC926770;"/>
-					<element geometry="Left=846;Top=1202;Right=1025;Bottom=1313;" subject="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" seqno="17" style="DUID=4EB7D866;NSL=0;"/>
-					<element geometry="Left=1040;Top=962;Right=1188;Bottom=1032;" subject="EAID_F655321A_F106_46f3_933E_53ADDFD9113B" seqno="18" style="DUID=73B616E3;NSL=0;"/>
-					<element geometry="Left=444;Top=604;Right=683;Bottom=689;" subject="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C" seqno="19" style="DUID=D2264175;NSL=0;"/>
-					<element geometry="Left=1004;Top=587;Right=1222;Bottom=706;" subject="EAID_D0A4903C_A7BD_44ac_960F_C4C98C40706A" seqno="20" style="DUID=5EE01C02;NSL=0;"/>
+					<element geometry="Left=641;Top=771;Right=857;Bottom=869;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="4" style="DUID=9D5FAD98;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=215;Top=483;Right=305;Bottom=553;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="5" style="DUID=DA6D8719;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=133;Top=604;Right=352;Bottom=689;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="6" style="DUID=58B7DA6A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1321;Top=311;Right=1629;Bottom=435;" subject="EAID_28F811B2_B8F5_4649_8793_87E238D6811B" 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=3483CF6A;"/>
+					<element geometry="Left=1321;Top=447;Right=1567;Bottom=587;" subject="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" 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=B82062F1;"/>
+					<element geometry="Left=1273;Top=684;Right=1498;Bottom=754;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" 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=EA1C4C23;"/>
+					<element geometry="Left=1641;Top=674;Right=1860;Bottom=764;" subject="EAID_F04E5C85_6CE4_42e5_B5B1_F96CAB80B7F4" seqno="10" style="NSL=0;DUID=8FEE6E8B;"/>
+					<element geometry="Left=1415;Top=793;Right=1605;Bottom=847;" subject="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4" seqno="11" style="NSL=0;DUID=F301CE71;"/>
+					<element geometry="Left=1049;Top=216;Right=1203;Bottom=277;" subject="EAID_80742452_A0D5_4a1a_8568_C49C5DA11831" seqno="12" style="NSL=0;DUID=8BC8ABCD;"/>
+					<element geometry="Left=771;Top=303;Right=925;Bottom=357;" subject="EAID_78B51DD4_EC1F_4397_98C3_93AE6677F8CA" seqno="13" style="DUID=E3CC8F4E;NSL=0;"/>
+					<element geometry="Left=545;Top=951;Right=788;Bottom=1043;" subject="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" seqno="14" style="DUID=E42F2F52;NSL=0;BCol=-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=1215;Right=754;Bottom=1300;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="15" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=CC926770;"/>
+					<element geometry="Left=846;Top=1202;Right=1025;Bottom=1313;" subject="EAID_1E0B8798_161F_491d_ADC5_9FD206CC6125" seqno="16" style="DUID=4EB7D866;NSL=0;"/>
+					<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=-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="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;"/>
@@ -7960,7 +7668,7 @@
 					<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=-22;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:-842$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="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="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;"/>
@@ -7972,22 +7680,20 @@
 					<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=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;"/>
+					<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;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C2D6205A_51AB_4613_8874_119FEFAF6080" style="Mode=3;EOID=E42F2F52;SOID=CA391782;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_55EE213D_C0F9_46f9_BA0A_CF9483F9B511" style="Mode=3;EOID=E42F2F52;SOID=D72CC01B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_75E487DA_CCAA_441d_8B59_686C4B791FB8" style="Mode=3;EOID=4EB7D866;SOID=D72CC01B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=47;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" style="Mode=3;EOID=15959C54;SOID=9D5FAD98;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-88;SY=0;EX=101;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=661:-699$360:-699$;" subject="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" style="Mode=3;EOID=58B7DA6A;SOID=9D5FAD98;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="SX=32;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=757:-681$;" subject="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" style="Mode=3;EOID=58B7DA6A;SOID=9D5FAD98;Color=-1;LWidth=0;TREE=OR;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=8BC8ABCD;SOID=3483CF6A;Color=-1;LWidth=0;Hidden=1;"/>
 					<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="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=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=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=-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=-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=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="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=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;"/>
@@ -7996,8 +7702,9 @@
 					<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_4F8C85CC_EF8D_49e2_821D_FF39CCA1773F" style="Mode=3;EOID=B82062F1;SOID=B82062F1;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<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="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=941:-468$971:-468$971:-429$941:-429$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=15959C54;SOID=15959C54;Color=-1;LWidth=0;Hidden=0;"/>
-					<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=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=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>
 			<diagram xmi:id="EAID_53A61934_F119_4692_8CC3_BFE2B530A2C4">
diff --git a/implementation/ePO/xmi_conceptual_model/ePO_CM.xml b/implementation/ePO/xmi_conceptual_model/ePO_CM.xml
index 1f14e57c..42f87a4d 100644
--- a/implementation/ePO/xmi_conceptual_model/ePO_CM.xml
+++ b/implementation/ePO/xmi_conceptual_model/ePO_CM.xml
@@ -1,20 +1,17 @@
 <?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" xmlns:thecustomprofile="http://www.sparxsystems.com/profiles/thecustomprofile/1.0">
-	<xmi:Documentation exporter="Enterprise  Architect" exporterVersion="6.5" exporterID="1559"/>
+	<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_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_0B563D27_1575_48a5_8CFF_5424B393E918" name="procurement criterion"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_0E2769F1_F27B_445a_A3EA_854B47E10131"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_12170F5C_506A_44bf_A694_24FCCC3FFDA5"/>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_155C7FA7_6962_4810_AED6_D94302F09660"/>
 				<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_2F3555E6_B9A6_4208_9A19_747532DBC93F"/>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_307A886F_B089_4e24_95CC_EC9CC2A318DC" name="contract modification eForm"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_31EA4D18_AE52_4312_865E_AA3D8CABF489" name="monetary value - competition"/>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A"/>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_414DE231_616E_4297_80E4_BD39186A377C" name="modification specification relations (per element)"/>
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" name="monetary value - completion"/>
@@ -31,14 +28,12 @@
 				<packagedElement xmi:type="uml:Class" xmi:id="EAID_BD29EEFB_4E03_4cf6_AD73_9F36D358A79D"/>
 				<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_C51CEE38_0715_4c7f_A11A_33482161EFBA"/>
-				<packagedElement xmi:type="uml:Class" xmi:id="EAID_D328B002_DFC9_487f_A930_EAEFF23E8568"/>
 				<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_DE101954_6101_4316_8883_58912E14D385"/>
 				<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_EED92360_39E2_48e3_93F3_A9FAE5CE18B1"/>
+				<packagedElement xmi:type="uml:Class" xmi:id="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1" name="$diagram://{4BA59459-2BE8-4a2a-9BD6-72CB34B74A87}"/>
 				<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_FA67183F_38CC_4aa6_945B_60FA54013A48" name="procurement object hierarchy"/>
@@ -46,934 +41,455 @@
 					<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"/>
-							<annotatedElement xmi:idref="EAID_1729B069_584F_4a4f_910B_A28B233CEB46"/>
 						</ownedComment>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" name="phase oriented">
 						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_81C81B52_091E_44a3_B615_FA2A1785469E" body="should this be review?&#xA;">
 							<annotatedElement xmi:idref="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72"/>
 						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" body="To be removed since is from Notice module. &#xA;Should we make a relation from epo:Notice?&#xA;">
-							<annotatedElement xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-						</ownedComment>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" name="procurement object">
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" body="&lt;b&gt;Procedure/ PlannedProcurementPart / Lot&lt;/b&gt; are a conflation of three aspects into one:&#xA;- the procedural / process / game rules&#xA;- the object/scope/purpose of procurement&#xA;- the description of influences or additional information related to the procurement (isSME suitable, isUsingEuFunds, etc.)&#xA;&#xA;TODO: the definitions NEED to be aligned, for now, to cover all three aspects! Possibly in the future model a separation of concerns for higher clarity/accuracy. &#xA;&#xA;&#xA;Note:&#xA;The current procedure class is a conflation of the &quot;process&quot; description and &quot;whole procurement subject matter&quot;.&#xA;&#xA;TODO: revise this definition.&#xA;TODO: specify that all procedures have al least one lot. &#xA;">
-							<annotatedElement xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-						</ownedComment>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" name="agent">
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" body="based on eForms (BT-124) a Channel may differ per Lot&#xA;based on standard forms, a channel may differ per procedure">
-							<annotatedElement xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-						</ownedComment>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" name="role">
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" body="Context: Expressing Needs">
-							<annotatedElement xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" body="Context: Sending of Goods&#xA;e.g. Amazon">
-							<annotatedElement xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" body="Context: &#xA;Issuing invoices, Credit notes&#xA;Could be performed by third parties on behalf of the seller. &#xA;">
-							<annotatedElement xmi:idref="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" body="Context: &#xA;Ordering, Despatch">
-							<annotatedElement xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" body="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.">
-							<annotatedElement xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" body="Here we have roles that belong to other modules (check all).&#xA;Discuss whether we need to move them.&#xA;">
-							<annotatedElement xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-						</ownedComment>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" name="role playing sides"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B6085AA3_C98C_49fa_8FA0_069B51B180A2" name="role predecessor dependecies"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" name="location"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" name="term">
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D67F46E0_2B15_4614_A170_F1414A602530" body="Revise the Term hierarchy.&#xA;&#xA;e.g. ReviewTerm is per Procedure in SF (to be investigated how it is in eForms). ">
-							<annotatedElement xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-						</ownedComment>
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" body="Estimated dates are not really conditions and stipulations, they are not terms. We need to segregate the procedural/process information from the procurement-object information in the future. ">
-							<annotatedElement xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-							<annotatedElement xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-						</ownedComment>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_1B056616_B822_4add_84D3_1D36186827ED" name="ProxyConnector"/>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_75629D1B_E406_4b38_82BA_5525819A470C" name="ProxyConnector">
-							<generalization xmi:type="uml:Generalization" xmi:id="EAID_9512B0DA_565A_4051_A589_525053877046" general="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" name="ProxyConnector">
-							<generalization xmi:type="uml:Generalization" xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" general="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
-						</packagedElement>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" name="ProxyConnector"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" name="participation request term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" name="review term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" name="access term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" name="procedure term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" name="submission term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" name="contract term"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" name="evaluation term"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" name="criterion">
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" name="ProxyConnector"/>
-						<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" name="ProxyConnector">
-							<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_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" name="strategic procurement"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" name="technique"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" name="award">
-						<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_A1BB437B_AD73_4f28_B11F_4B624C467CDA" name="contextual description"/>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" name="document">
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" name="contract"/>
-						<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" name="review">
-							<ownedComment xmi:type="uml:Comment" xmi:id="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" body="What are the entities that can be reviewed?">
-								<annotatedElement xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-							</ownedComment>
-						</packagedElement>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" name="notice description">
-						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" body="Added hasAdditionalInformation to cover for section VII.2 in F14, since we do not have the Corrigendum notice type anymore in eForms.">
-							<annotatedElement xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
-						</ownedComment>
 					</packagedElement>
 				</packagedElement>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" name="classes">
-					<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"/>
-							<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="*"/>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" name="procurement object">
+					<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_LI000001__6281_4f14_8017_204CCE05A2CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000002__6281_4f14_8017_204CCE05A2CC" value="1"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
-						<memberEnd xmi:idref="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E"/>
-						<memberEnd xmi:idref="EAID_srcCFCF08_3F48_4102_8A68_8655E9F9B47E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFCF08_3F48_4102_8A68_8655E9F9B47E" association="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
-							<type xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+					<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:Dependency" xmi:id="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" supplier="EAID_02014F61_A766_467e_BD3D_7F41689C651B" client="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
-						<memberEnd xmi:idref="EAID_dst5C20FC_D382_4766_9563_4C96020D607C"/>
-						<memberEnd xmi:idref="EAID_src5C20FC_D382_4766_9563_4C96020D607C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5C20FC_D382_4766_9563_4C96020D607C" association="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
-							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src66393B_8067_4f18_9B28_69541B862505" association="EAID_9866393B_8067_4f18_9B28_69541B862505">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
 						</ownedEnd>
 					</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"/>
-							<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"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
+					<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_LI000003_9DD2_4e8d_A789_27EB4A9F5270" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000004_9DD2_4e8d_A789_27EB4A9F5270" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AAB414E4_6B76_4724_850E_FD4E9D1A9A36" name="epo:hasAdditionalInformation">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000005_6B76_4724_850E_FD4E9D1A9A36" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000006_6B76_4724_850E_FD4E9D1A9A36" value="*"/>
 							<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"/>
-					</packagedElement>
-					<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_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_LI000011__4BC2_452d_9B78_BA9B3F1E9FF6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012__4BC2_452d_9B78_BA9B3F1E9FF6" value="*"/>
-						</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_LI000013__7AAE_4276_AA04_83E4BB664FCB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014__7AAE_4276_AA04_83E4BB664FCB" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
-						<memberEnd xmi:idref="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6"/>
-						<memberEnd xmi:idref="EAID_src204966_4BC2_452d_9B78_BA9B3F1E9FF6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src204966_4BC2_452d_9B78_BA9B3F1E9FF6" association="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
-							<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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src90AB87_7AAE_4276_AA04_83E4BB664FCB" association="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
-							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_A7C105EE_0251_4249_919A_46302D44059E" supplier="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" client="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
-					<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_LI000015_8A97_4bdd_A15E_C716B815CC13" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_8A97_4bdd_A15E_C716B815CC13" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_81C8CC43_F9F3_4dbf_B86E_3117B7D59284" name="epo:isUsingEUFunds">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000007_F9F3_4dbf_B86E_3117B7D59284" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000008_F9F3_4dbf_B86E_3117B7D59284" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000017_499F_489c_AA49_2F4562A747ED" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018_499F_489c_AA49_2F4562A747ED" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7963EE6A_6E17_4cc0_9D4D_F2B3BD7DDB82" name="epo:isCoveredByGPA">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000009_6E17_4cc0_9D4D_F2B3BD7DDB82" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000010_6E17_4cc0_9D4D_F2B3BD7DDB82" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000019__AC70_477b_AA0D_15C3CB11CC0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__AC70_477b_AA0D_15C3CB11CC0C" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C4978D81_7036_4dff_887C_4784F26EE895" name="epo:isRecurrent">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000011_7036_4dff_887C_4784F26EE895" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000012_7036_4dff_887C_4784F26EE895" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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: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_LI000021_4A31_454e_9AA2_45BD4C3E92E9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022_4A31_454e_9AA2_45BD4C3E92E9" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8F62A6D7_E2B5_4316_8B14_C02E3FA048F0" name="epo:hasRecurrenceDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000013_E2B5_4316_8B14_C02E3FA048F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000014_E2B5_4316_8B14_C02E3FA048F0" 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_LI000023_8E25_4f73_ACD2_B452220092B4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024_8E25_4f73_ACD2_B452220092B4" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9D9B9980_E3C9_4487_8DC0_2F870FD3CE34" name="epo:hasLegalBasisDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000015_E3C9_4487_8DC0_2F870FD3CE34" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000016_E3C9_4487_8DC0_2F870FD3CE34" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000025__AEE0_4ae9_BFBB_56453EA7473F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__AEE0_4ae9_BFBB_56453EA7473F" value="*"/>
+						<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_LI000017__4706_4097_A6E7_D6BCEF598E62" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000018__4706_4097_A6E7_D6BCEF598E62" value="1"/>
 						</ownedAttribute>
-					</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src59B897_AEE0_4ae9_BFBB_56453EA7473F" association="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-						</ownedEnd>
-					</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_LI000027_BE8B_47ed_A7E8_401033A4F00F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028_BE8B_47ed_A7E8_401033A4F00F" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000019__139F_4712_8BB6_681888ACB178" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000020__139F_4712_8BB6_681888ACB178" value="*"/>
 						</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_LI000029_8A39_4ef1_9823_B5AEDF9F9A8D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030_8A39_4ef1_9823_B5AEDF9F9A8D" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000021__B3CA_4c57_AD37_79213AD539C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000022__B3CA_4c57_AD37_79213AD539C8" value="1"/>
 						</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_LI000031_503B_420d_A265_995666BBE4C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032_503B_420d_A265_995666BBE4C8" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000023__821C_40da_B5DE_D7ED82169378" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000024__821C_40da_B5DE_D7ED82169378" value="*"/>
 						</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_LI000033_7AC7_4d4d_9FEB_F13DE10B9AC2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034_7AC7_4d4d_9FEB_F13DE10B9AC2" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000025__433B_4242_826E_974C4A3AEF87" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000026__433B_4242_826E_974C4A3AEF87" value="*"/>
 						</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_LI000035_9A7F_450b_9015_99A5CECE86AA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036_9A7F_450b_9015_99A5CECE86AA" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000027__0FBB_48f1_B54C_5FBB7973D2FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000028__0FBB_48f1_B54C_5FBB7973D2FA" value="1"/>
 						</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_LI000037_1030_43e1_BA3D_464008D8F6FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038_1030_43e1_BA3D_464008D8F6FA" value="1"/>
-							<type xmi:idref="EAJava_xsd_anyURI"/>
+						<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_LI000029__8A73_411c_B751_1F0998CC86A7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000030__8A73_411c_B751_1F0998CC86A7" value="*"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst228FCF_2B3C_44e6_BD17_379180274988" name="cv: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_LI000039__2B3C_44e6_BD17_379180274988" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__2B3C_44e6_BD17_379180274988" value="1"/>
+						<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_LI000031__672E_4208_A39E_E74480CCE1D0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000032__672E_4208_A39E_E74480CCE1D0" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
-						<memberEnd xmi:idref="EAID_dst228FCF_2B3C_44e6_BD17_379180274988"/>
-						<memberEnd xmi:idref="EAID_src228FCF_2B3C_44e6_BD17_379180274988"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src228FCF_2B3C_44e6_BD17_379180274988" association="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
-							<type xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
+						<memberEnd xmi:idref="EAID_dst23E4D3_4706_4097_A6E7_D6BCEF598E62"/>
+						<memberEnd xmi:idref="EAID_src23E4D3_4706_4097_A6E7_D6BCEF598E62"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src23E4D3_4706_4097_A6E7_D6BCEF598E62" association="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-						<memberEnd xmi:idref="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5"/>
-						<memberEnd xmi:idref="EAID_src812517_A9DA_432d_A7B8_F5FEC69BBDA5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src812517_A9DA_432d_A7B8_F5FEC69BBDA5" association="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src625CFF_139F_4712_8BB6_681888ACB178" association="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
-						<memberEnd xmi:idref="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914"/>
-						<memberEnd xmi:idref="EAID_src6E629B_BECA_4e04_B7C9_925B517BC914"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6E629B_BECA_4e04_B7C9_925B517BC914" association="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
-							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<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_C2D44282_10C8_422c_82F3_D4CC50B411F4">
-						<memberEnd xmi:idref="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4"/>
-						<memberEnd xmi:idref="EAID_srcD44282_10C8_422c_82F3_D4CC50B411F4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD44282_10C8_422c_82F3_D4CC50B411F4" association="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+						<memberEnd xmi:idref="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378"/>
+						<memberEnd xmi:idref="EAID_src8697AF_821C_40da_B5DE_D7ED82169378"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8697AF_821C_40da_B5DE_D7ED82169378" association="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_48133D6A_BE44_43c9_A647_04650698EC95" name="cpov:PublicOrganisation">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" general="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" name="cpv: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_LI000041_B79E_4eb4_80F0_5CA37EE9A9CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042_B79E_4eb4_80F0_5CA37EE9A9CC" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000043_9850_48d7_9727_2F95770EFD98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044_9850_48d7_9727_2F95770EFD98" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000045_95D6_4189_9498_4B6491677473" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046_95D6_4189_9498_4B6491677473" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000047_9ACE_4eb3_AAA4_B695015AA072" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048_9ACE_4eb3_AAA4_B695015AA072" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000049_14E5_4c22_8CDF_B2A44D33AB17" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050_14E5_4c22_8CDF_B2A44D33AB17" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000051_B813_473e_B8A5_0B8FD9FC3485" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_B813_473e_B8A5_0B8FD9FC3485" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000053_2568_474b_B4FD_89DEF282507C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054_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_LI000055__9308_46ad_9581_3601B37AA6A4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056__9308_46ad_9581_3601B37AA6A4" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EE792_E682_4cf4_B67B_A6B270F34AEA" name="person:placeOfBirth" association="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000057__E682_4cf4_B67B_A6B270F34AEA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__E682_4cf4_B67B_A6B270F34AEA" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst095B58_1DB2_4aad_836A_C0752B58E250" name="person:placeOfDeath" association="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000059__1DB2_4aad_836A_C0752B58E250" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__1DB2_4aad_836A_C0752B58E250" 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_LI000061__543D_493b_8D89_2DD66914E4DD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__543D_493b_8D89_2DD66914E4DD" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
-						<memberEnd xmi:idref="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4"/>
-						<memberEnd xmi:idref="EAID_src236B4B_9308_46ad_9581_3601B37AA6A4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src236B4B_9308_46ad_9581_3601B37AA6A4" association="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
-							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
+						<memberEnd xmi:idref="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87"/>
+						<memberEnd xmi:idref="EAID_srcD470D5_433B_4242_826E_974C4A3AEF87"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD470D5_433B_4242_826E_974C4A3AEF87" association="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
-						<memberEnd xmi:idref="EAID_dst5EE792_E682_4cf4_B67B_A6B270F34AEA"/>
-						<memberEnd xmi:idref="EAID_src5EE792_E682_4cf4_B67B_A6B270F34AEA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EE792_E682_4cf4_B67B_A6B270F34AEA" association="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
-							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
+						<memberEnd xmi:idref="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA"/>
+						<memberEnd xmi:idref="EAID_src203FD8_0FBB_48f1_B54C_5FBB7973D2FA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src203FD8_0FBB_48f1_B54C_5FBB7973D2FA" association="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</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:Association" xmi:id="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
-						<memberEnd xmi:idref="EAID_dst095B58_1DB2_4aad_836A_C0752B58E250"/>
-						<memberEnd xmi:idref="EAID_src095B58_1DB2_4aad_836A_C0752B58E250"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src095B58_1DB2_4aad_836A_C0752B58E250" association="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
-							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
+						<memberEnd xmi:idref="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7"/>
+						<memberEnd xmi:idref="EAID_srcE68ED4_8A73_411c_B751_1F0998CC86A7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE68ED4_8A73_411c_B751_1F0998CC86A7" association="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD">
-						<memberEnd xmi:idref="EAID_dst0783CB_543D_493b_8D89_2DD66914E4DD"/>
-						<memberEnd xmi:idref="EAID_src0783CB_543D_493b_8D89_2DD66914E4DD"/>
-					</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"/>
-							<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"/>
-							<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="*"/>
-						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
+						<memberEnd xmi:idref="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0"/>
+						<memberEnd xmi:idref="EAID_src463DF7_672E_4208_A39E_E74480CCE1D0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src463DF7_672E_4208_A39E_E74480CCE1D0" association="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
+							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src904936_FC7D_45f3_AFEF_E5B428B672AA" association="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+						<memberEnd xmi:idref="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B"/>
+						<memberEnd xmi:idref="EAID_src24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" association="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
 							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
-						<memberEnd xmi:idref="EAID_dst1AA9A3_574B_4f10_925C_C2404C3C5805"/>
-						<memberEnd xmi:idref="EAID_src1AA9A3_574B_4f10_925C_C2404C3C5805"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AA9A3_574B_4f10_925C_C2404C3C5805" association="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
-							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
-						<memberEnd xmi:idref="EAID_dstC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA"/>
-						<memberEnd xmi:idref="EAID_srcC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" association="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
-							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFFCDAE_C459_4420_9649_6F7949D3D9BA" association="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
+							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
 						</ownedEnd>
 					</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"/>
-							<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"/>
-						</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"/>
-						</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"/>
+					<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_LI000033__6E1E_4123_A7F5_548146C45BC4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000034__6E1E_4123_A7F5_548146C45BC4" value="*"/>
 						</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"/>
+						<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_LI000035__35C4_4015_80BE_9C778A0BA2A5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000036__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>
-					<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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+						<memberEnd xmi:idref="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4"/>
+						<memberEnd xmi:idref="EAID_src1AA305_6E1E_4123_A7F5_548146C45BC4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AA305_6E1E_4123_A7F5_548146C45BC4" association="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
+							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 						</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"/>
-						<memberEnd xmi:idref="EAID_src0B3C1A_A0BD_494b_BEE6_89F708783872"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0B3C1A_A0BD_494b_BEE6_89F708783872" association="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB98FB_35C4_4015_80BE_9C778A0BA2A5" association="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
+						<memberEnd xmi:idref="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7"/>
+						<memberEnd xmi:idref="EAID_srcCFA3D8_50E1_40f7_8F66_FA023FA190E7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFA3D8_50E1_40f7_8F66_FA023FA190E7" association="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8E8C16_CD7F_4664_8346_839CB32AF64E" association="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
-							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+						<memberEnd xmi:idref="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F"/>
+						<memberEnd xmi:idref="EAID_src732599_332F_4f0e_BFE6_593632EDB11F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src732599_332F_4f0e_BFE6_593632EDB11F" association="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-						<memberEnd xmi:idref="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
-						<memberEnd xmi:idref="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" association="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-							<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+						<memberEnd xmi:idref="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF"/>
+						<memberEnd xmi:idref="EAID_srcB9978D_8D66_48ab_B3C3_6654ABB348DF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB9978D_8D66_48ab_B3C3_6654ABB348DF" association="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
+							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
-						<memberEnd xmi:idref="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7"/>
-						<memberEnd xmi:idref="EAID_src2EFC84_74F8_415f_B4C7_BC3E17610EF7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2EFC84_74F8_415f_B4C7_BC3E17610EF7" association="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
-							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
+						<memberEnd xmi:idref="EAID_dst156914_725C_4a26_B380_6FDE59360DAF"/>
+						<memberEnd xmi:idref="EAID_src156914_725C_4a26_B380_6FDE59360DAF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src156914_725C_4a26_B380_6FDE59360DAF" association="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
+							<type xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-						<memberEnd xmi:idref="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
-						<memberEnd xmi:idref="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE" association="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
+						<memberEnd xmi:idref="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24"/>
+						<memberEnd xmi:idref="EAID_src56734D_7238_4738_9F80_EC054ABA2E24"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56734D_7238_4738_9F80_EC054ABA2E24" association="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-						<memberEnd xmi:idref="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0"/>
-						<memberEnd xmi:idref="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0" association="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
+						<memberEnd xmi:idref="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554"/>
+						<memberEnd xmi:idref="EAID_src9050E1_4285_45aa_87A9_6A9BA62CD554"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9050E1_4285_45aa_87A9_6A9BA62CD554" association="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-						<memberEnd xmi:idref="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
-						<memberEnd xmi:idref="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" association="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_38A9CEA0_D542_4a11_AEA0_EC5F24CAF1A1">
+						<memberEnd xmi:idref="EAID_dstA9CEA0_D542_4a11_AEA0_EC5F24CAF1A1"/>
+						<memberEnd xmi:idref="EAID_srcA9CEA0_D542_4a11_AEA0_EC5F24CAF1A1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA9CEA0_D542_4a11_AEA0_EC5F24CAF1A1" association="EAID_38A9CEA0_D542_4a11_AEA0_EC5F24CAF1A1">
+							<type xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000037__D542_4a11_AEA0_EC5F24CAF1A1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000038__D542_4a11_AEA0_EC5F24CAF1A1" value="1"/>
 						</ownedEnd>
 					</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"/>
-							<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"/>
-							<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"/>
-							<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"/>
-							<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="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088__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="*"/>
-						</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"/>
-						</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"/>
-						</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="*"/>
-						</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="*"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+						<memberEnd xmi:idref="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547"/>
+						<memberEnd xmi:idref="EAID_srcB4981B_F0BC_4d9f_9B16_DD484C6E2547"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB4981B_F0BC_4d9f_9B16_DD484C6E2547" association="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
-						<memberEnd xmi:idref="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43"/>
-						<memberEnd xmi:idref="EAID_src1B9223_B1D3_4ffe_B219_FFD9D57F9B43"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1B9223_B1D3_4ffe_B219_FFD9D57F9B43" association="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
+						<memberEnd xmi:idref="EAID_dstA06CD6_3F60_4e8f_A32A_669CA4829E33"/>
+						<memberEnd xmi:idref="EAID_srcA06CD6_3F60_4e8f_A32A_669CA4829E33"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA06CD6_3F60_4e8f_A32A_669CA4829E33" association="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
-						<memberEnd xmi:idref="EAID_dstFA8589_17C4_41df_B066_E37D4DDD0C0A"/>
-						<memberEnd xmi:idref="EAID_srcFA8589_17C4_41df_B066_E37D4DDD0C0A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFA8589_17C4_41df_B066_E37D4DDD0C0A" association="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
+						<memberEnd xmi:idref="EAID_dstB64699_B98C_49f8_AAA8_01BAEEF0DD49"/>
+						<memberEnd xmi:idref="EAID_srcB64699_B98C_49f8_AAA8_01BAEEF0DD49"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB64699_B98C_49f8_AAA8_01BAEEF0DD49" association="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
+							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
-						<memberEnd xmi:idref="EAID_dstDE70B2_FCDD_46b7_8DA7_19386DB49579"/>
-						<memberEnd xmi:idref="EAID_srcDE70B2_FCDD_46b7_8DA7_19386DB49579"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE70B2_FCDD_46b7_8DA7_19386DB49579" association="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
+						<memberEnd xmi:idref="EAID_dstC46ECB_7950_4db1_AA23_2C9AD7E8E999"/>
+						<memberEnd xmi:idref="EAID_srcC46ECB_7950_4db1_AA23_2C9AD7E8E999"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC46ECB_7950_4db1_AA23_2C9AD7E8E999" association="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
+							<type xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
-						<memberEnd xmi:idref="EAID_dstB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84"/>
-						<memberEnd xmi:idref="EAID_srcB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" association="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
+						<memberEnd xmi:idref="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605"/>
+						<memberEnd xmi:idref="EAID_srcDB7A9B_1395_4587_9F41_FE45FA8A0605"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB7A9B_1395_4587_9F41_FE45FA8A0605" association="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
+							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
-						<memberEnd xmi:idref="EAID_dstD6284A_096F_4112_989F_32AD38804C63"/>
-						<memberEnd xmi:idref="EAID_srcD6284A_096F_4112_989F_32AD38804C63"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD6284A_096F_4112_989F_32AD38804C63" association="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
+						<memberEnd xmi:idref="EAID_dst55842B_BD0C_4fab_8681_C210E308328D"/>
+						<memberEnd xmi:idref="EAID_src55842B_BD0C_4fab_8681_C210E308328D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src55842B_BD0C_4fab_8681_C210E308328D" association="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
-						<memberEnd xmi:idref="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90"/>
-						<memberEnd xmi:idref="EAID_src25948E_6ABD_4c9b_83A7_6E582F53DA90"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src25948E_6ABD_4c9b_83A7_6E582F53DA90" association="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
-							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
+						<memberEnd xmi:idref="EAID_dst7715A6_6B94_492e_9116_A734400E6358"/>
+						<memberEnd xmi:idref="EAID_src7715A6_6B94_492e_9116_A734400E6358"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7715A6_6B94_492e_9116_A734400E6358" association="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
+							<type xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" supplier="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" client="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" name="epo:AcquiringCentralPurchasingBody">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" general="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
+						<memberEnd xmi:idref="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487"/>
+						<memberEnd xmi:idref="EAID_srcBA801A_E8C8_4628_94BC_1C90816E0487"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA801A_E8C8_4628_94BC_1C90816E0487" association="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
+							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" name="epo:AcquiringParty">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src990D3C_51ED_4626_9195_C96F98BD3349" association="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" name="epo:AdHocChannel">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD" general="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-					</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="*"/>
-							<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="*"/>
-							<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"/>
+					<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_LI000039__7CD7_4f69_89C8_D3FC52D7CF0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000040__7CD7_4f69_89C8_D3FC52D7CF0C" value="*"/>
 						</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="*"/>
+						<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_LI000041__C459_4420_9649_6F7949D3D9BA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000042__C459_4420_9649_6F7949D3D9BA" value="1"/>
 						</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="*"/>
+						<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_LI000043__A434_424a_8ECC_D32EF06886BB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000044__A434_424a_8ECC_D32EF06886BB" value="1"/>
 						</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="*"/>
+						<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_LI000045__378D_4c18_9647_0E2E150D7463" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000046__378D_4c18_9647_0E2E150D7463" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
-						<memberEnd xmi:idref="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6"/>
-						<memberEnd xmi:idref="EAID_src9200E2_D732_4a5e_BCE2_05E832F758D6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9200E2_D732_4a5e_BCE2_05E832F758D6" association="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
-							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
-						<memberEnd xmi:idref="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B"/>
-						<memberEnd xmi:idref="EAID_src24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" association="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
-							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
-						<memberEnd xmi:idref="EAID_dstB0A22A_438E_4ee3_8C70_92C7E2AD60DC"/>
-						<memberEnd xmi:idref="EAID_srcB0A22A_438E_4ee3_8C70_92C7E2AD60DC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB0A22A_438E_4ee3_8C70_92C7E2AD60DC" association="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" association="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
+							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
-						<memberEnd xmi:idref="EAID_dst0AED44_E69C_416d_988A_2D1D02E4692C"/>
-						<memberEnd xmi:idref="EAID_src0AED44_E69C_416d_988A_2D1D02E4692C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0AED44_E69C_416d_988A_2D1D02E4692C" association="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+					<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_67CCA39E_1E30_4142_9536_906052B9AABC">
-						<memberEnd xmi:idref="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC"/>
-						<memberEnd xmi:idref="EAID_srcCCA39E_1E30_4142_9536_906052B9AABC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCCA39E_1E30_4142_9536_906052B9AABC" association="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					<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_8922E99F_335A_40fc_AD89_A9564A5F5F61">
-						<memberEnd xmi:idref="EAID_dst22E99F_335A_40fc_AD89_A9564A5F5F61"/>
-						<memberEnd xmi:idref="EAID_src22E99F_335A_40fc_AD89_A9564A5F5F61"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src22E99F_335A_40fc_AD89_A9564A5F5F61" association="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" association="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
 							<type xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-						<memberEnd xmi:idref="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284"/>
-						<memberEnd xmi:idref="EAID_srcCB9CAD_CC6F_4c97_B4AA_B8C9088E4284"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB9CAD_CC6F_4c97_B4AA_B8C9088E4284" association="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
-						<memberEnd xmi:idref="EAID_dst476D87_C25E_439e_AA92_BB00BFD1DB22"/>
-						<memberEnd xmi:idref="EAID_src476D87_C25E_439e_AA92_BB00BFD1DB22"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src476D87_C25E_439e_AA92_BB00BFD1DB22" association="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
-							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
-						<memberEnd xmi:idref="EAID_dst2C6E19_FB7C_453e_9B40_0A74A0E00195"/>
-						<memberEnd xmi:idref="EAID_src2C6E19_FB7C_453e_9B40_0A74A0E00195"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2C6E19_FB7C_453e_9B40_0A74A0E00195" association="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
-						<memberEnd xmi:idref="EAID_dst9EA23B_3707_4f38_8E54_F2D9BE08A114"/>
-						<memberEnd xmi:idref="EAID_src9EA23B_3707_4f38_8E54_F2D9BE08A114"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9EA23B_3707_4f38_8E54_F2D9BE08A114" association="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" name="epo:AuxiliaryParty">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
-						<memberEnd xmi:idref="EAID_dst8F0271_F439_4d4a_8CF1_D9F81DFCBA1A"/>
-						<memberEnd xmi:idref="EAID_src8F0271_F439_4d4a_8CF1_D9F81DFCBA1A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" association="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
-							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
+						<memberEnd xmi:idref="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90"/>
+						<memberEnd xmi:idref="EAID_src25948E_6ABD_4c9b_83A7_6E582F53DA90"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src25948E_6ABD_4c9b_83A7_6E582F53DA90" association="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
+							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" name="epo:AwardCriteriaSummary">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" general="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-					</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"/>
+					<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_LI000047_2B58_40de_B8E7_6698AA589C5E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000048_2B58_40de_B8E7_6698AA589C5E" 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"/>
-							<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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19" supplier="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" client="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0" supplier="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" client="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" name="epo:Awarder">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</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="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8DBF2461_62A0_40d3_B39B_A3C66EAE9CD7" name="epo:hasAcceleratedProcedureJustification">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000049_62A0_40d3_B39B_A3C66EAE9CD7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000050_62A0_40d3_B39B_A3C66EAE9CD7" 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"/>
-							<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"/>
-							<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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1237AF42_0ACB_4905_9E98_37EB4AD1C8CE" name="epo:hasMainFeature">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000051_0ACB_4905_9E98_37EB4AD1C8CE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000052_0ACB_4905_9E98_37EB4AD1C8CE" value="*"/>
 							<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"/>
-							<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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" name="epo:AwardingCentralPurchasingBody">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" general="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
-					</packagedElement>
-					<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"/>
-						</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="*"/>
-						</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"/>
-						</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"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
-						<memberEnd xmi:idref="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6"/>
-						<memberEnd xmi:idref="EAID_src7A511C_F377_4405_82EA_14ABA20458B6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7A511C_F377_4405_82EA_14ABA20458B6" association="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
-							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
-						<memberEnd xmi:idref="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403"/>
-						<memberEnd xmi:idref="EAID_src4C01E9_6CF5_410f_83E6_3CAF530D5403"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4C01E9_6CF5_410f_83E6_3CAF530D5403" association="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
-							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" supplier="EAID_D46376EC_6B98_4926_8627_A594E6819D78" client="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
-						<memberEnd xmi:idref="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C"/>
-						<memberEnd xmi:idref="EAID_src57E7B8_BA32_4888_BB1A_167306D6B16C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57E7B8_BA32_4888_BB1A_167306D6B16C" association="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
-							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
-						<memberEnd xmi:idref="EAID_dst215D61_0282_4111_B11C_CBD651205C58"/>
-						<memberEnd xmi:idref="EAID_src215D61_0282_4111_B11C_CBD651205C58"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src215D61_0282_4111_B11C_CBD651205C58" association="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
-							<type xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
-						<memberEnd xmi:idref="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95"/>
-						<memberEnd xmi:idref="EAID_srcBE64C7_3F6B_4881_AB89_9342AF882E95"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE64C7_3F6B_4881_AB89_9342AF882E95" association="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
-							<type xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" name="epo:BudgetProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
-						<memberEnd xmi:idref="EAID_dst9B2877_CC4F_472f_9ED2_7DCA708FAEF8"/>
-						<memberEnd xmi:idref="EAID_src9B2877_CC4F_472f_9ED2_7DCA708FAEF8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B2877_CC4F_472f_9ED2_7DCA708FAEF8" association="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
-							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
-						</ownedEnd>
-					</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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DCB6F0F3_A5AA_4582_8838_5A6AE79C81A6" name="epo:isJointProcurement">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000053_A5AA_4582_8838_5A6AE79C81A6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000054_A5AA_4582_8838_5A6AE79C81A6" 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="*"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" general="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" supplier="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" client="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C"/>
-					<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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_E1AF6ECF_E2E5_420f_B454_601D03392D27" name="epo:isDesignContest">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000055_E2E5_420f_B454_601D03392D27" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000056_E2E5_420f_B454_601D03392D27" 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="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000057__FD33_4153_9939_FA613CEB5D22" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000058__FD33_4153_9939_FA613CEB5D22" value="*"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_anyURI"/>
+						<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_LI000059__E1D3_4c16_AB2B_CBE8A5D24AC5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000060__E1D3_4c16_AB2B_CBE8A5D24AC5" value="1"/>
 						</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="*"/>
+						<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_LI000061__5092_48cf_878A_8035A42A43F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000062__5092_48cf_878A_8035A42A43F9" 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"/>
+						<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_LI000063__5AC2_42b1_AA17_2A8EC003CCFE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000064__5AC2_42b1_AA17_2A8EC003CCFE" 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_LI000143__8AD7_4cd0_B3EE_963EFE7F14CA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144__8AD7_4cd0_B3EE_963EFE7F14CA" value="*"/>
+						<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_LI000065__51ED_4626_9195_C96F98BD3349" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000066__51ED_4626_9195_C96F98BD3349" 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_LI000145__AFB2_421a_BBA1_4FFA393BE7FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__AFB2_421a_BBA1_4FFA393BE7FA" value="*"/>
+						<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_LI000067__7F36_41c3_8166_36C3538F2F3A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000068__7F36_41c3_8166_36C3538F2F3A" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
-						<memberEnd xmi:idref="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649"/>
-						<memberEnd xmi:idref="EAID_src57D84E_2B82_485f_A14D_2E0BE4C98649"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57D84E_2B82_485f_A14D_2E0BE4C98649" association="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
-							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
-						<memberEnd xmi:idref="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA"/>
-						<memberEnd xmi:idref="EAID_src76346D_AFB2_421a_BBA1_4FFA393BE7FA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src76346D_AFB2_421a_BBA1_4FFA393BE7FA" association="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
-							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-						<memberEnd xmi:idref="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283"/>
-						<memberEnd xmi:idref="EAID_srcC00346_DC8E_4fd4_8A9A_9A4173CBD283"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC00346_DC8E_4fd4_8A9A_9A4173CBD283" association="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
-						<memberEnd xmi:idref="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6"/>
-						<memberEnd xmi:idref="EAID_src14A192_0DFA_49f4_AB11_165E12CB38A6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14A192_0DFA_49f4_AB11_165E12CB38A6" association="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
-							<type xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
+						<memberEnd xmi:idref="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22"/>
+						<memberEnd xmi:idref="EAID_src8C734E_FD33_4153_9939_FA613CEB5D22"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C734E_FD33_4153_9939_FA613CEB5D22" association="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-						<memberEnd xmi:idref="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
-						<memberEnd xmi:idref="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+						<memberEnd xmi:idref="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5"/>
+						<memberEnd xmi:idref="EAID_src460B26_E1D3_4c16_AB2B_CBE8A5D24AC5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" association="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</ownedEnd>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
@@ -983,13 +499,6 @@
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0C71CA_F2D3_48ca_8D27_E3F34E3AF36B" association="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
-						</ownedEnd>
-					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
 						<memberEnd xmi:idref="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE"/>
 						<memberEnd xmi:idref="EAID_src1E7677_5AC2_42b1_AA17_2A8EC003CCFE"/>
@@ -997,1071 +506,1065 @@
 							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
-						<memberEnd xmi:idref="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453"/>
-						<memberEnd xmi:idref="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453" association="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
-						<memberEnd xmi:idref="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
-						<memberEnd xmi:idref="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC" association="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
+						<memberEnd xmi:idref="EAID_dst9BB27E_7F36_41c3_8166_36C3538F2F3A"/>
+						<memberEnd xmi:idref="EAID_src9BB27E_7F36_41c3_8166_36C3538F2F3A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9BB27E_7F36_41c3_8166_36C3538F2F3A" association="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
+							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
-						<memberEnd xmi:idref="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46"/>
-						<memberEnd xmi:idref="EAID_src687C05_7D35_48ab_B0AA_8C6787D5DF46"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src687C05_7D35_48ab_B0AA_8C6787D5DF46" association="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
+						<memberEnd xmi:idref="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7"/>
+						<memberEnd xmi:idref="EAID_src6933BC_AE5B_4536_B67E_B79F177247C7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6933BC_AE5B_4536_B67E_B79F177247C7" association="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
+							<type xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" name="epo:Candidate">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
-						<memberEnd xmi:idref="EAID_dst7753B6_365D_4082_8CC4_DA85F79E7124"/>
-						<memberEnd xmi:idref="EAID_src7753B6_365D_4082_8CC4_DA85F79E7124"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7753B6_365D_4082_8CC4_DA85F79E7124" association="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
-							<type xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
+						<memberEnd xmi:idref="EAID_dst762169_952E_4db0_9FE7_6B4A895F2AF1"/>
+						<memberEnd xmi:idref="EAID_src762169_952E_4db0_9FE7_6B4A895F2AF1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src762169_952E_4db0_9FE7_6B4A895F2AF1" association="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" name="epo:CatalogueProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-						<memberEnd xmi:idref="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
-						<memberEnd xmi:idref="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3" association="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
+						<memberEnd xmi:idref="EAID_dstA2D6DE_6BD5_49b4_9900_A82C2C734195"/>
+						<memberEnd xmi:idref="EAID_srcA2D6DE_6BD5_49b4_9900_A82C2C734195"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA2D6DE_6BD5_49b4_9900_A82C2C734195" association="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
+							<type xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" name="epo:CatalogueReceiver">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-						<memberEnd xmi:idref="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5"/>
-						<memberEnd xmi:idref="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5" association="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
+						<memberEnd xmi:idref="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6"/>
+						<memberEnd xmi:idref="EAID_srcF23C3F_F74B_434a_AA2D_59AF706E79E6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF23C3F_F74B_434a_AA2D_59AF706E79E6" association="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" name="epo:CentralPurchasingBody">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" general="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" name="epo:ConcessionContract">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					</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_LI000147_8B8C_4be7_9E3D_A338B0A518EE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148_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_LI000149__77C6_4480_A13E_A5E9A66D9379" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150__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_LI000151__424C_4f36_8E1E_BF993F4D765A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152__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_LI000153__0633_482d_BA4A_4553057B7C23" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__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>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
-						<memberEnd xmi:idref="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379"/>
-						<memberEnd xmi:idref="EAID_srcA6C38F_77C6_4480_A13E_A5E9A66D9379"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6C38F_77C6_4480_A13E_A5E9A66D9379" association="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
-							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+						<memberEnd xmi:idref="EAID_dst307E49_0838_4569_819E_D05D699E0983"/>
+						<memberEnd xmi:idref="EAID_src307E49_0838_4569_819E_D05D699E0983"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src307E49_0838_4569_819E_D05D699E0983" association="EAID_B1307E49_0838_4569_819E_D05D699E0983">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
-						<memberEnd xmi:idref="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A"/>
-						<memberEnd xmi:idref="EAID_srcD18452_424C_4f36_8E1E_BF993F4D765A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD18452_424C_4f36_8E1E_BF993F4D765A" association="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
-							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
+						<memberEnd xmi:idref="EAID_dst9DD4EA_847D_4a36_96C4_9709B72BA620"/>
+						<memberEnd xmi:idref="EAID_src9DD4EA_847D_4a36_96C4_9709B72BA620"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9DD4EA_847D_4a36_96C4_9709B72BA620" association="EAID_E69DD4EA_847D_4a36_96C4_9709B72BA620">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
-						<memberEnd xmi:idref="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23"/>
-						<memberEnd xmi:idref="EAID_src5EEDCE_0633_482d_BA4A_4553057B7C23"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EEDCE_0633_482d_BA4A_4553057B7C23" association="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
-							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
+						<memberEnd xmi:idref="EAID_dst65A241_4CD0_4009_A42F_041D198E70E4"/>
+						<memberEnd xmi:idref="EAID_src65A241_4CD0_4009_A42F_041D198E70E4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src65A241_4CD0_4009_A42F_041D198E70E4" association="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
+							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
-						<memberEnd xmi:idref="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85"/>
-						<memberEnd xmi:idref="EAID_srcC8CD49_71D8_4ef9_919E_87DD36154F85"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC8CD49_71D8_4ef9_919E_87DD36154F85" association="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
+						<memberEnd xmi:idref="EAID_dstAC099A_F1E0_4926_9F7B_6C2B6C33321B"/>
+						<memberEnd xmi:idref="EAID_srcAC099A_F1E0_4926_9F7B_6C2B6C33321B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC099A_F1E0_4926_9F7B_6C2B6C33321B" association="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-						<memberEnd xmi:idref="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA"/>
-						<memberEnd xmi:idref="EAID_src203FD8_0FBB_48f1_B54C_5FBB7973D2FA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src203FD8_0FBB_48f1_B54C_5FBB7973D2FA" association="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+						<memberEnd xmi:idref="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449"/>
+						<memberEnd xmi:idref="EAID_src55E894_651A_4a8b_A411_E8DA312BC449"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src55E894_651A_4a8b_A411_E8DA312BC449" association="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
+							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" name="epo:ContextSpecificDescription"/>
-					<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_LI000155_EE66_4466_B876_2648A2FCB695" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156_EE66_4466_B876_2648A2FCB695" value="1"/>
-							<type xmi:idref="EAJava_xsd_date"/>
+					<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_LI000069_49D1_4dc7_8B71_0B31EC8EEB86" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000070_49D1_4dc7_8B71_0B31EC8EEB86" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000157_FF03_40dc_B883_35A17CF5DA90" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158_FF03_40dc_B883_35A17CF5DA90" value="1"/>
-							<type xmi:idref="EAJava_xsd_date"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_173CC3A0_D7A4_446f_9BF4_D16B18C2D0C4" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000071_D7A4_446f_9BF4_D16B18C2D0C4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000072_D7A4_446f_9BF4_D16B18C2D0C4" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7" name="epo:hasLotReference" association="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
+						<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_LI000159__50E1_40f7_8F66_FA023FA190E7" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160__50E1_40f7_8F66_FA023FA190E7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000073__332F_4f0e_BFE6_593632EDB11F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000074__332F_4f0e_BFE6_593632EDB11F" 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_LI000161__5876_4d85_8FFB_CD1622DAF44A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162__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_LI000163__76C7_486a_9953_EA1E6D255A89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164__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_LI000165__2B60_4f59_8AE5_E5806C9B2562" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166__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_LI000167__DC8E_4fd4_8A9A_9A4173CBD283" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__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_LI000169__F8BB_4c6f_9356_F67CF0DAA096" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170__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_LI000171__A9AF_47c5_B217_F52FFB1CAD53" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__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_LI000173__0CAC_40d5_A730_696A39D2224E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__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_LI000175__CD1A_40df_9C2D_9222DAB14E19" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__CD1A_40df_9C2D_9222DAB14E19" value="1"/>
+						<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_LI000075__C775_4324_AEBA_EA277D05F7E8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000076__C775_4324_AEBA_EA277D05F7E8" value="*"/>
 						</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_LI000177__26BC_46b1_A885_D5B3B1D5960A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__26BC_46b1_A885_D5B3B1D5960A" value="*"/>
+						<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_LI000077__3A48_4541_8467_9DDA71E8D534" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000078__3A48_4541_8467_9DDA71E8D534" value="1"/>
 						</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_LI000179__13BB_48c2_A5D7_18A876BF10CF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180__13BB_48c2_A5D7_18A876BF10CF" value="*"/>
+						<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_LI000079__D179_4558_8F62_2FA41A99DF74" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000080__D179_4558_8F62_2FA41A99DF74" value="1"/>
 						</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_LI000181__CE05_4098_ADF6_2FEC3A1BB755" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182__CE05_4098_ADF6_2FEC3A1BB755" value="1"/>
+						<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_LI000081__5437_4a3f_9E66_5EBEFD7759BC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000082__5437_4a3f_9E66_5EBEFD7759BC" 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_LI000183__7D35_48ab_B0AA_8C6787D5DF46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184__7D35_48ab_B0AA_8C6787D5DF46" value="*"/>
+						<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_LI000083__3362_472f_B087_27A619B6C819" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000084__3362_472f_B087_27A619B6C819" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
-						<memberEnd xmi:idref="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7"/>
-						<memberEnd xmi:idref="EAID_srcCFA3D8_50E1_40f7_8F66_FA023FA190E7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFA3D8_50E1_40f7_8F66_FA023FA190E7" association="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-						<memberEnd xmi:idref="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
-						<memberEnd xmi:idref="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A" association="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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_3220FB6D_76C7_486a_9953_EA1E6D255A89">
-						<memberEnd xmi:idref="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89"/>
-						<memberEnd xmi:idref="EAID_src20FB6D_76C7_486a_9953_EA1E6D255A89"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src20FB6D_76C7_486a_9953_EA1E6D255A89" association="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
-						<memberEnd xmi:idref="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562"/>
-						<memberEnd xmi:idref="EAID_srcB9AB7E_2B60_4f59_8AE5_E5806C9B2562"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB9AB7E_2B60_4f59_8AE5_E5806C9B2562" association="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
-						<memberEnd xmi:idref="EAID_dst14DE2C_F8BB_4c6f_9356_F67CF0DAA096"/>
-						<memberEnd xmi:idref="EAID_src14DE2C_F8BB_4c6f_9356_F67CF0DAA096"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14DE2C_F8BB_4c6f_9356_F67CF0DAA096" association="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
-						<memberEnd xmi:idref="EAID_dstF02E69_A9AF_47c5_B217_F52FFB1CAD53"/>
-						<memberEnd xmi:idref="EAID_srcF02E69_A9AF_47c5_B217_F52FFB1CAD53"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF02E69_A9AF_47c5_B217_F52FFB1CAD53" association="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+						<memberEnd xmi:idref="EAID_dst7073E1_3362_472f_B087_27A619B6C819"/>
+						<memberEnd xmi:idref="EAID_src7073E1_3362_472f_B087_27A619B6C819"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7073E1_3362_472f_B087_27A619B6C819" association="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
+							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
-						<memberEnd xmi:idref="EAID_dst41BADB_0CAC_40d5_A730_696A39D2224E"/>
-						<memberEnd xmi:idref="EAID_src41BADB_0CAC_40d5_A730_696A39D2224E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src41BADB_0CAC_40d5_A730_696A39D2224E" association="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDACA2B_8A10_4516_8C96_D5EA3AE635E9" association="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
-						<memberEnd xmi:idref="EAID_dstBC2835_CD1A_40df_9C2D_9222DAB14E19"/>
-						<memberEnd xmi:idref="EAID_srcBC2835_CD1A_40df_9C2D_9222DAB14E19"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBC2835_CD1A_40df_9C2D_9222DAB14E19" association="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+						<memberEnd xmi:idref="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C"/>
+						<memberEnd xmi:idref="EAID_srcCFA3B0_EE66_4ace_9069_38D7A3B7A01C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFA3B0_EE66_4ace_9069_38D7A3B7A01C" association="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
-						<memberEnd xmi:idref="EAID_dst8CA809_26BC_46b1_A885_D5B3B1D5960A"/>
-						<memberEnd xmi:idref="EAID_src8CA809_26BC_46b1_A885_D5B3B1D5960A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CA809_26BC_46b1_A885_D5B3B1D5960A" association="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
-						<memberEnd xmi:idref="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF"/>
-						<memberEnd xmi:idref="EAID_srcE75552_13BB_48c2_A5D7_18A876BF10CF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE75552_13BB_48c2_A5D7_18A876BF10CF" association="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD708FC_CE05_4098_ADF6_2FEC3A1BB755" association="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
-							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1326915C_1564_403a_A96E_65DCEC3F641A">
-						<memberEnd xmi:idref="EAID_dst26915C_1564_403a_A96E_65DCEC3F641A"/>
-						<memberEnd xmi:idref="EAID_src26915C_1564_403a_A96E_65DCEC3F641A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src26915C_1564_403a_A96E_65DCEC3F641A" association="EAID_1326915C_1564_403a_A96E_65DCEC3F641A">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
-						<memberEnd xmi:idref="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053"/>
-						<memberEnd xmi:idref="EAID_srcDE37BE_E478_4159_8F53_7F49CAD18053"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE37BE_E478_4159_8F53_7F49CAD18053" association="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
-							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+						<memberEnd xmi:idref="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D"/>
+						<memberEnd xmi:idref="EAID_src36ABDE_C6FC_4a8d_93CA_CC7ACC63568D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" association="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
+							<type xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
-						<memberEnd xmi:idref="EAID_dstEB6ABB_DB35_4b96_9E46_695F79EE21E5"/>
-						<memberEnd xmi:idref="EAID_srcEB6ABB_DB35_4b96_9E46_695F79EE21E5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB6ABB_DB35_4b96_9E46_695F79EE21E5" association="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
+						<memberEnd xmi:idref="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98"/>
+						<memberEnd xmi:idref="EAID_src5EC3B7_635F_49aa_B61D_661F42799A98"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EC3B7_635F_49aa_B61D_661F42799A98" association="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
-						<memberEnd xmi:idref="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43"/>
-						<memberEnd xmi:idref="EAID_srcC1B1D3_F31C_482d_82B0_7ED4BAC17D43"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC1B1D3_F31C_482d_82B0_7ED4BAC17D43" association="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
+						<memberEnd xmi:idref="EAID_dst6CC936_0C78_48b9_A44A_1D010626BE9B"/>
+						<memberEnd xmi:idref="EAID_src6CC936_0C78_48b9_A44A_1D010626BE9B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC936_0C78_48b9_A44A_1D010626BE9B" association="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
+							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
-						<memberEnd xmi:idref="EAID_dst2A2E13_AE75_4b0d_B325_4443E0BF6A2D"/>
-						<memberEnd xmi:idref="EAID_src2A2E13_AE75_4b0d_B325_4443E0BF6A2D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2A2E13_AE75_4b0d_B325_4443E0BF6A2D" association="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
+						<memberEnd xmi:idref="EAID_dstCB407C_08A7_467b_8826_322D82AB6DB0"/>
+						<memberEnd xmi:idref="EAID_srcCB407C_08A7_467b_8826_322D82AB6DB0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB407C_08A7_467b_8826_322D82AB6DB0" association="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
 							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-							<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-						<memberEnd xmi:idref="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A"/>
-						<memberEnd xmi:idref="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A" association="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-							<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
+						<memberEnd xmi:idref="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B"/>
+						<memberEnd xmi:idref="EAID_srcF18DD0_9007_48f0_9959_5EE6A49DDD1B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF18DD0_9007_48f0_9959_5EE6A49DDD1B" association="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-						<memberEnd xmi:idref="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E"/>
-						<memberEnd xmi:idref="EAID_src94D054_08DB_4bb5_A279_498213B45F8E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src94D054_08DB_4bb5_A279_498213B45F8E" association="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
+						<memberEnd xmi:idref="EAID_dstAB3946_257D_4382_A283_8978FB00BD51"/>
+						<memberEnd xmi:idref="EAID_srcAB3946_257D_4382_A283_8978FB00BD51"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAB3946_257D_4382_A283_8978FB00BD51" association="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
+							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-						<memberEnd xmi:idref="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
-						<memberEnd xmi:idref="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12" association="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+						<memberEnd xmi:idref="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7"/>
+						<memberEnd xmi:idref="EAID_src36A935_6B61_49a0_A901_D1A6B9C4D5A7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src36A935_6B61_49a0_A901_D1A6B9C4D5A7" association="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
 						</ownedEnd>
 					</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_LI000185_605C_457b_A377_9332E2AA545D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186_605C_457b_A377_9332E2AA545D" value="1"/>
+					<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_LI000085_2E9E_40ca_8D61_5175A4D36F9E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000086_2E9E_40ca_8D61_5175A4D36F9E" value="*"/>
 							<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_LI000187__E478_4159_8F53_7F49CAD18053" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188__E478_4159_8F53_7F49CAD18053" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE1FA5B9_94C7_44ae_BA93_BC77CD3943C8" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000087_94C7_44ae_BA93_BC77CD3943C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000088_94C7_44ae_BA93_BC77CD3943C8" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000189__3E6C_424a_AACD_8319D1389BB9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190__3E6C_424a_AACD_8319D1389BB9" value="1"/>
+						<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_LI000089__574B_4f10_925C_C2404C3C5805" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000090__574B_4f10_925C_C2404C3C5805" value="*"/>
 						</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_LI000191__1395_4587_9F41_FE45FA8A0605" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__1395_4587_9F41_FE45FA8A0605" value="1"/>
+						<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_LI000091__387D_467a_95E2_ACDA293AE181" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000092__387D_467a_95E2_ACDA293AE181" value="*"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458" name="epo:providesContractTotalPaymentValue" association="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
+						<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_LI000193__EF0B_4bd7_8D4A_95B9DD217458" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194__EF0B_4bd7_8D4A_95B9DD217458" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000093__6ADC_4a69_9C87_1543CFCC17D9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000094__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_LI000095__C207_456a_A0EF_B68899832EE8" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000096__C207_456a_A0EF_B68899832EE8" value="1"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
-						<memberEnd xmi:idref="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9"/>
-						<memberEnd xmi:idref="EAID_src84019D_3E6C_424a_AACD_8319D1389BB9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src84019D_3E6C_424a_AACD_8319D1389BB9" association="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
-							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
+						<memberEnd xmi:idref="EAID_dst1AA9A3_574B_4f10_925C_C2404C3C5805"/>
+						<memberEnd xmi:idref="EAID_src1AA9A3_574B_4f10_925C_C2404C3C5805"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AA9A3_574B_4f10_925C_C2404C3C5805" association="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
+							<type xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
-						<memberEnd xmi:idref="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605"/>
-						<memberEnd xmi:idref="EAID_srcDB7A9B_1395_4587_9F41_FE45FA8A0605"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDB7A9B_1395_4587_9F41_FE45FA8A0605" association="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
-							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+					<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_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-						<memberEnd xmi:idref="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458"/>
-						<memberEnd xmi:idref="EAID_src377F2A_EF0B_4bd7_8D4A_95B9DD217458"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src377F2A_EF0B_4bd7_8D4A_95B9DD217458" association="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+					<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:Class" xmi:id="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" name="epo:Contractor">
-						<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_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_LI000195__919D_4de3_BCF2_6CA4F71150CA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196__919D_4de3_BCF2_6CA4F71150CA" value="1"/>
+					<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_LI000097__3CD9_464a_82E7_387507253B10" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000098__3CD9_464a_82E7_387507253B10" value="1"/>
 						</ownedAttribute>
 					</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA3014F_919D_4de3_BCF2_6CA4F71150CA" association="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
-							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
+					<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:Class" xmi:id="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" name="epo:ContractSpecificTerm">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" general="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
-						<memberEnd xmi:idref="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0"/>
-						<memberEnd xmi:idref="EAID_src463DF7_672E_4208_A39E_E74480CCE1D0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src463DF7_672E_4208_A39E_E74480CCE1D0" association="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<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:Association" xmi:id="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
+						<memberEnd xmi:idref="EAID_dstBC2835_CD1A_40df_9C2D_9222DAB14E19"/>
+						<memberEnd xmi:idref="EAID_srcBC2835_CD1A_40df_9C2D_9222DAB14E19"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBC2835_CD1A_40df_9C2D_9222DAB14E19" association="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</ownedEnd>
 					</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_LI000197_DA32_4dad_A471_35D47B85EEA0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198_DA32_4dad_A471_35D47B85EEA0" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+					<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_LI000099_EF2C_47f3_9FB2_D2BCDA794426" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000100_EF2C_47f3_9FB2_D2BCDA794426" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000199_612A_41e4_9039_862FA1A389EE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200_612A_41e4_9039_862FA1A389EE" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_425B4513_4A80_406f_BCA7_4059C49A272A" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000101_4A80_406f_BCA7_4059C49A272A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000102_4A80_406f_BCA7_4059C49A272A" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000201_B40A_4fed_BDA5_11FC9CBE7652" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202_B40A_4fed_BDA5_11FC9CBE7652" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000103__D909_4610_841A_BB8035525574" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000104__D909_4610_841A_BB8035525574" value="1"/>
 						</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_LI000203_EAB8_45b5_865A_D1F442CCDE19" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204_EAB8_45b5_865A_D1F442CCDE19" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000105__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000106__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="*"/>
 						</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_LI000205_9138_46d4_AA7B_A555B7F284A2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206_9138_46d4_AA7B_A555B7F284A2" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000107__93F7_4d51_A677_A1E36D3B53C0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000108__93F7_4d51_A677_A1E36D3B53C0" value="1"/>
 						</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_LI000207_B9A9_4b8c_8855_DCE8E0600AF6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208_B9A9_4b8c_8855_DCE8E0600AF6" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000109__257D_4382_A283_8978FB00BD51" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000110__257D_4382_A283_8978FB00BD51" value="1"/>
 						</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_LI000209_F373_4e7f_8BFE_5AB5D113FDD1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210_F373_4e7f_8BFE_5AB5D113FDD1" value="*"/>
+					</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_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+						<memberEnd xmi:idref="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5"/>
+						<memberEnd xmi:idref="EAID_src8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" association="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+							<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_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" name="agent">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" body="based on eForms (BT-124) a Channel may differ per Lot&#xA;based on standard forms, a channel may differ per procedure">
+						<annotatedElement xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					</ownedComment>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_48133D6A_BE44_43c9_A647_04650698EC95" name="cpov:PublicOrganisation">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" general="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" name="cpv: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_LI000111_B79E_4eb4_80F0_5CA37EE9A9CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000112_B79E_4eb4_80F0_5CA37EE9A9CC" 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_LI000211_377D_40f9_BFBF_D7305458427F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212_377D_40f9_BFBF_D7305458427F" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2FEA1955_9850_48d7_9727_2F95770EFD98" name="foaf:familyName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000113_9850_48d7_9727_2F95770EFD98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000114_9850_48d7_9727_2F95770EFD98" 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_LI000213_74A7_4026_8C22_E64B96F7B965" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214_74A7_4026_8C22_E64B96F7B965" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_610E9A03_95D6_4189_9498_4B6491677473" name="foaf:givenName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000115_95D6_4189_9498_4B6491677473" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000116_95D6_4189_9498_4B6491677473" 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_LI000215_76CE_4f7f_81F9_D9B627E4DEA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216_76CE_4f7f_81F9_D9B627E4DEA1" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_B886263C_9ACE_4eb3_AAA4_B695015AA072" name="person:patronymicName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000117_9ACE_4eb3_AAA4_B695015AA072" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000118_9ACE_4eb3_AAA4_B695015AA072" value="*"/>
 							<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_LI000217_9E94_4367_9FC8_D27251DB20AF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000218_9E94_4367_9FC8_D27251DB20AF" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_C9671A98_14E5_4c22_8CDF_B2A44D33AB17" name="dct:alternative">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000119_14E5_4c22_8CDF_B2A44D33AB17" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000120_14E5_4c22_8CDF_B2A44D33AB17" 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_LI000219_174F_46a9_B3CB_00BE0B239330" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000220_174F_46a9_B3CB_00BE0B239330" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_263C8A1F_B813_473e_B8A5_0B8FD9FC3485" name="person:birthName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000121_B813_473e_B8A5_0B8FD9FC3485" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000122_B813_473e_B8A5_0B8FD9FC3485" 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_LI000221__CB8C_462e_BBD0_75D03FADA8D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000222__CB8C_462e_BBD0_75D03FADA8D8" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8CD78B10_2568_474b_B4FD_89DEF282507C" name="cv:birthDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000123_2568_474b_B4FD_89DEF282507C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000124_2568_474b_B4FD_89DEF282507C" value="1"/>
+							<type xmi:idref="EAJava_xsd_date"/>
 						</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_LI000223__1698_4353_BEDB_63334B745ECB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000224__1698_4353_BEDB_63334B745ECB" value="1"/>
+						<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_LI000125__9308_46ad_9581_3601B37AA6A4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000126__9308_46ad_9581_3601B37AA6A4" 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">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst5EE792_E682_4cf4_B67B_A6B270F34AEA" name="person:placeOfBirth" association="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
 							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000225__74F8_415f_B4C7_BC3E17610EF7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000226__74F8_415f_B4C7_BC3E17610EF7" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000127__E682_4cf4_B67B_A6B270F34AEA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000128__E682_4cf4_B67B_A6B270F34AEA" value="1"/>
 						</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_LI000227__502A_413a_8694_914903478877" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000228__502A_413a_8694_914903478877" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst095B58_1DB2_4aad_836A_C0752B58E250" name="person:placeOfDeath" association="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
+							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000129__1DB2_4aad_836A_C0752B58E250" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000130__1DB2_4aad_836A_C0752B58E250" 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_LI000229__A73E_42a1_854B_9995087470E4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000230__A73E_42a1_854B_9995087470E4" value="1"/>
+						<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_LI000131__543D_493b_8D89_2DD66914E4DD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000132__543D_493b_8D89_2DD66914E4DD" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
-						<memberEnd xmi:idref="EAID_dst1164A7_CB8C_462e_BBD0_75D03FADA8D8"/>
-						<memberEnd xmi:idref="EAID_src1164A7_CB8C_462e_BBD0_75D03FADA8D8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1164A7_CB8C_462e_BBD0_75D03FADA8D8" association="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
-							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
+						<memberEnd xmi:idref="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4"/>
+						<memberEnd xmi:idref="EAID_src236B4B_9308_46ad_9581_3601B37AA6A4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src236B4B_9308_46ad_9581_3601B37AA6A4" association="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
+							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B" supplier="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
-						<memberEnd xmi:idref="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB"/>
-						<memberEnd xmi:idref="EAID_src1E8ADE_1698_4353_BEDB_63334B745ECB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1E8ADE_1698_4353_BEDB_63334B745ECB" association="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
-							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
+						<memberEnd xmi:idref="EAID_dst5EE792_E682_4cf4_B67B_A6B270F34AEA"/>
+						<memberEnd xmi:idref="EAID_src5EE792_E682_4cf4_B67B_A6B270F34AEA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EE792_E682_4cf4_B67B_A6B270F34AEA" association="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA">
+							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" supplier="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4" supplier="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1" supplier="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F593B546_502A_413a_8694_914903478877">
-						<memberEnd xmi:idref="EAID_dst93B546_502A_413a_8694_914903478877"/>
-						<memberEnd xmi:idref="EAID_src93B546_502A_413a_8694_914903478877"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src93B546_502A_413a_8694_914903478877" association="EAID_F593B546_502A_413a_8694_914903478877">
-							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+					<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:Association" xmi:id="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
+						<memberEnd xmi:idref="EAID_dst095B58_1DB2_4aad_836A_C0752B58E250"/>
+						<memberEnd xmi:idref="EAID_src095B58_1DB2_4aad_836A_C0752B58E250"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src095B58_1DB2_4aad_836A_C0752B58E250" association="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250">
+							<type xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
-						<memberEnd xmi:idref="EAID_dstA22183_A73E_42a1_854B_9995087470E4"/>
-						<memberEnd xmi:idref="EAID_srcA22183_A73E_42a1_854B_9995087470E4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA22183_A73E_42a1_854B_9995087470E4" association="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
-							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD">
+						<memberEnd xmi:idref="EAID_dst0783CB_543D_493b_8D89_2DD66914E4DD"/>
+						<memberEnd xmi:idref="EAID_src0783CB_543D_493b_8D89_2DD66914E4DD"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
+						<memberEnd xmi:idref="EAID_dstD7352D_80E6_41e6_B85A_672AACE795E2"/>
+						<memberEnd xmi:idref="EAID_srcD7352D_80E6_41e6_B85A_672AACE795E2"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD7352D_80E6_41e6_B85A_672AACE795E2" association="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
+							<type xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896"/>
 						</ownedEnd>
 					</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_LI000231_CCB2_4a7b_A2C9_F47802435B26" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000232_CCB2_4a7b_A2C9_F47802435B26" value="1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" name="epo:AdHocChannel">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD" general="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					</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_LI000133_7EA2_4c52_90A8_0F254E9E77D7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000134_7EA2_4c52_90A8_0F254E9E77D7" 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_LI000233_C420_46bc_A3DA_63313A6F8C5E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000234_C420_46bc_A3DA_63313A6F8C5E" value="1"/>
+						<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_LI000135__543D_493b_8D89_2DD66914E4DD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000136__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>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" supplier="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" client="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C"/>
+					<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_LI000137_9499_473a_B5FA_2C4594C6B9A0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000138_9499_473a_B5FA_2C4594C6B9A0" value="*"/>
 							<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_LI000235_F0BE_4958_BE04_24CB02C3E3DC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000236_F0BE_4958_BE04_24CB02C3E3DC" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000139__946A_403c_B906_6DB183F74D9F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000140__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_LI000141__AB87_4730_A6DF_915A5FB0B3DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000142__AB87_4730_A6DF_915A5FB0B3DB" value="1"/>
 						</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_LI000237_89F9_4090_93D7_77B848BA8488" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000238_89F9_4090_93D7_77B848BA8488" value="*"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+						<memberEnd xmi:idref="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F"/>
+						<memberEnd xmi:idref="EAID_srcA8BD10_946A_403c_B906_6DB183F74D9F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA8BD10_946A_403c_B906_6DB183F74D9F" association="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
+							<type xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+						<memberEnd xmi:idref="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB"/>
+						<memberEnd xmi:idref="EAID_srcF440DD_AB87_4730_A6DF_915A5FB0B3DB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF440DD_AB87_4730_A6DF_915A5FB0B3DB" association="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
+							<type xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D"/>
+						</ownedEnd>
+					</packagedElement>
+					<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_LI000143_5C0F_4b3c_8D5E_F1C29EFEBB48" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000144_5C0F_4b3c_8D5E_F1C29EFEBB48" value="*"/>
 							<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"/>
-						<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_LI000239__3C73_4e45_9F54_76A56333BE1E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000240__3C73_4e45_9F54_76A56333BE1E" value="*"/>
+						<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_LI000145__D8E3_4eda_9351_165A2D6D972E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000146__D8E3_4eda_9351_165A2D6D972E" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
-						<memberEnd xmi:idref="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E"/>
-						<memberEnd xmi:idref="EAID_src51F167_3C73_4e45_9F54_76A56333BE1E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src51F167_3C73_4e45_9F54_76A56333BE1E" association="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
-							<type xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
+						<memberEnd xmi:idref="EAID_dstF47D81_D8E3_4eda_9351_165A2D6D972E"/>
+						<memberEnd xmi:idref="EAID_srcF47D81_D8E3_4eda_9351_165A2D6D972E"/>
 					</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_LI000241_0C10_47cd_8014_0CF056ADDCF4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000242_0C10_47cd_8014_0CF056ADDCF4" value="*"/>
+					<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_LI000147_7FDD_4e84_BE6E_9839EB3B7763" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000148_7FDD_4e84_BE6E_9839EB3B7763" 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_LI000243__725C_4a26_B380_6FDE59360DAF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000244__725C_4a26_B380_6FDE59360DAF" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_246B4CD5_545D_40e6_BC72_AB7858D869B1" name="epo:hasAlias">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000149_545D_40e6_BC72_AB7858D869B1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000150_545D_40e6_BC72_AB7858D869B1" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000245__AE5B_4536_B67E_B79F177247C7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000246__AE5B_4536_B67E_B79F177247C7" value="1"/>
+						<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_LI000151__6066_4ba7_B084_12D7110FE9E0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000152__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_LI000153__D8E3_4eda_9351_165A2D6D972E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000154__D8E3_4eda_9351_165A2D6D972E" value="*"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_279636BF_8F0D_4744_8B59_3277E5CE2E90" supplier="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" client="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
-						<memberEnd xmi:idref="EAID_dst156914_725C_4a26_B380_6FDE59360DAF"/>
-						<memberEnd xmi:idref="EAID_src156914_725C_4a26_B380_6FDE59360DAF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src156914_725C_4a26_B380_6FDE59360DAF" association="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
-							<type xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
+					<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_5A6933BC_AE5B_4536_B67E_B79F177247C7">
-						<memberEnd xmi:idref="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7"/>
-						<memberEnd xmi:idref="EAID_src6933BC_AE5B_4536_B67E_B79F177247C7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6933BC_AE5B_4536_B67E_B79F177247C7" association="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
-							<type xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+						<memberEnd xmi:idref="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6"/>
+						<memberEnd xmi:idref="EAID_src9200E2_D732_4a5e_BCE2_05E832F758D6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9200E2_D732_4a5e_BCE2_05E832F758D6" association="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000247__EBFD_419c_8F21_8256FE25DBAC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000248__EBFD_419c_8F21_8256FE25DBAC" value="*"/>
+					<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_LI000155__4B2A_411b_B5EB_19C2D921F4D1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000156__4B2A_411b_B5EB_19C2D921F4D1" value="*"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
-						<memberEnd xmi:idref="EAID_dstBA1AAE_EBFD_419c_8F21_8256FE25DBAC"/>
-						<memberEnd xmi:idref="EAID_srcBA1AAE_EBFD_419c_8F21_8256FE25DBAC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAE_EBFD_419c_8F21_8256FE25DBAC" association="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
-							<type xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
+						<memberEnd xmi:idref="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
+						<memberEnd xmi:idref="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1" association="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
+							<type xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
 						</ownedEnd>
 					</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_LI000249_01DA_4da5_8782_30A2D193D4B4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000250_01DA_4da5_8782_30A2D193D4B4" value="1"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+						<memberEnd xmi:idref="EAID_dst693B40_13CE_47d1_A051_E627959E09EF"/>
+						<memberEnd xmi:idref="EAID_src693B40_13CE_47d1_A051_E627959E09EF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src693B40_13CE_47d1_A051_E627959E09EF" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
+							<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
+						</ownedEnd>
+					</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_LI000157_F4BC_41d4_AC3D_ED76B4DB6031" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000158_F4BC_41d4_AC3D_ED76B4DB6031" value="*"/>
 							<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_LI000251_C5F4_4f21_9EF1_1A912A3B0BB5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000252_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_LI000253_CD7A_4066_8A4A_E58D6D3A45F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000254_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_LI000255_E919_4ed9_8E59_56E7A1D1DF02" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000256_E919_4ed9_8E59_56E7A1D1DF02" value="1"/>
-							<type xmi:idref="EAJava_xsd_date"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_007010B6_A8F8_4270_B7F3_A6520D473D5E" name="epo:hasBuyerLegalTypeDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000159_A8F8_4270_B7F3_A6520D473D5E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000160_A8F8_4270_B7F3_A6520D473D5E" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000257_7361_4b50_A424_99670D546E07" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000258_7361_4b50_A424_99670D546E07" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_37683BEF_44D2_405c_BD81_82AFC900B45E" name="epo:hasLegalFormType">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000161_44D2_405c_BD81_82AFC900B45E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000162_44D2_405c_BD81_82AFC900B45E" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000259_3387_4afc_904E_98634DCB59F5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000260_3387_4afc_904E_98634DCB59F5" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_603D2E08_0496_4bc9_88B1_69BC1C7E7EC5" name="epo:hasMainActivityDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000163_0496_4bc9_88B1_69BC1C7E7EC5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000164_0496_4bc9_88B1_69BC1C7E7EC5" 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_LI000261_8F3D_4028_9A5B_A927863C6D72" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000262_8F3D_4028_9A5B_A927863C6D72" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_92AEFFF2_FA4D_44f1_804B_58D9571C4D04" name="epo:hasInternetAddress">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000165_FA4D_44f1_804B_58D9571C4D04" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000166_FA4D_44f1_804B_58D9571C4D04" 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_LI000263_992B_4a90_B977_87F24DE80620" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000264_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">
+						<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_LI000265__19C6_4908_B93C_EED975A6974F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000266__19C6_4908_B93C_EED975A6974F" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000167__A3A5_457d_AE66_986280A7B2F6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000168__A3A5_457d_AE66_986280A7B2F6" value="*"/>
 						</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_LI000267__0D40_4e9f_8018_10297955785C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000268__0D40_4e9f_8018_10297955785C" value="*"/>
+						<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_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_LI000169__E672_481d_B370_202D9A0110E0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000170__E672_481d_B370_202D9A0110E0" 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_LI000269__532C_460c_99CE_63F041A42F06" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000270__532C_460c_99CE_63F041A42F06" value="*"/>
+						<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_LI000171__E8DA_47c5_AD39_5BA2A66950B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000172__E8DA_47c5_AD39_5BA2A66950B9" value="1"/>
 						</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_LI000271__DD67_4f31_B72E_BC6C99FF3009" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000272__DD67_4f31_B72E_BC6C99FF3009" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501" name="cv: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_LI000173__1865_4c8b_82ED_0BAA7D433501" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000174__1865_4c8b_82ED_0BAA7D433501" 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_LI000273__8A0D_4eae_BCF0_75001B7FF4D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000274__8A0D_4eae_BCF0_75001B7FF4D0" value="*"/>
+						<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_LI000175__10C8_422c_82F3_D4CC50B411F4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000176__10C8_422c_82F3_D4CC50B411F4" 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_LI000275__45B0_449d_B8FF_34E21440DAD9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000276__45B0_449d_B8FF_34E21440DAD9" value="*"/>
+						<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_LI000177__A51F_434f_9F2B_CD75C658FF42" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000178__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_LI000179__F52F_4373_8164_044CE03A05CB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000180__F52F_4373_8164_044CE03A05CB" 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"/>
+					<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_39F3583F_0D40_4e9f_8018_10297955785C">
-						<memberEnd xmi:idref="EAID_dstF3583F_0D40_4e9f_8018_10297955785C"/>
-						<memberEnd xmi:idref="EAID_srcF3583F_0D40_4e9f_8018_10297955785C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF3583F_0D40_4e9f_8018_10297955785C" association="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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">
+						<memberEnd xmi:idref="EAID_dstF93267_E672_481d_B370_202D9A0110E0"/>
+						<memberEnd xmi:idref="EAID_srcF93267_E672_481d_B370_202D9A0110E0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF93267_E672_481d_B370_202D9A0110E0" association="EAID_2FF93267_E672_481d_B370_202D9A0110E0">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+						<memberEnd xmi:idref="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9"/>
+						<memberEnd xmi:idref="EAID_src50E4FC_E8DA_47c5_AD39_5BA2A66950B9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src50E4FC_E8DA_47c5_AD39_5BA2A66950B9" association="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						</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"/>
-						<memberEnd xmi:idref="EAID_srcE6AD20_DD67_4f31_B72E_BC6C99FF3009"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE6AD20_DD67_4f31_B72E_BC6C99FF3009" association="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
+						<memberEnd xmi:idref="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501"/>
+						<memberEnd xmi:idref="EAID_src23612C_1865_4c8b_82ED_0BAA7D433501"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src23612C_1865_4c8b_82ED_0BAA7D433501" association="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" supplier="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" client="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
-						<memberEnd xmi:idref="EAID_dst894735_8A0D_4eae_BCF0_75001B7FF4D0"/>
-						<memberEnd xmi:idref="EAID_src894735_8A0D_4eae_BCF0_75001B7FF4D0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src894735_8A0D_4eae_BCF0_75001B7FF4D0" association="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
+						<memberEnd xmi:idref="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4"/>
+						<memberEnd xmi:idref="EAID_srcD44282_10C8_422c_82F3_D4CC50B411F4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD44282_10C8_422c_82F3_D4CC50B411F4" association="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
-						<memberEnd xmi:idref="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9"/>
-						<memberEnd xmi:idref="EAID_srcE11A54_45B0_449d_B8FF_34E21440DAD9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE11A54_45B0_449d_B8FF_34E21440DAD9" association="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
-							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
+						<memberEnd xmi:idref="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
+						<memberEnd xmi:idref="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42" association="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
+							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-						<memberEnd xmi:idref="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9"/>
-						<memberEnd xmi:idref="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9" association="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
-							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+					<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: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>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065" supplier="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" client="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" name="epo:EAuctionTechnique">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" general="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" name="role">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" body="Context: Expressing Needs">
+						<annotatedElement xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" body="Context: Sending of Goods&#xA;e.g. Amazon">
+						<annotatedElement xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" body="Context: &#xA;Issuing invoices, Credit notes&#xA;Could be performed by third parties on behalf of the seller. &#xA;">
+						<annotatedElement xmi:idref="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" body="Context: &#xA;Ordering, Despatch">
+						<annotatedElement xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" body="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.">
+						<annotatedElement xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
+					</ownedComment>
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" body="Here we have roles that belong to other modules (check all).&#xA;Discuss whether we need to move them.&#xA;">
+						<annotatedElement xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					</ownedComment>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" name="epo:AcquiringCentralPurchasingBody">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" general="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" name="epo:EconomicStandingSummary">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_35039C01_2836_47b3_898F_14269D31CF88" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" name="epo:AcquiringParty">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
 					</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_LI000277_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000278_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
+					<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_LI000181_60CC_4828_8DAB_CC5101B58287" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000182_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_LI000183_7513_48cd_8763_8038F66E55AF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000184_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_LI000185__D732_4a5e_BCE2_05E832F758D6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000186__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_LI000187__FC7D_45f3_AFEF_E5B428B672AA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000188__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_LI000189__BECA_4e04_B7C9_925B517BC914" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000190__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_LI000191__CBDA_4f14_91FB_B8F7B19FEB4B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000192__CBDA_4f14_91FB_B8F7B19FEB4B" value="*"/>
+						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" name="epo:EmploymentInformationProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" name="epo:EnvironmentalProtectionInformationProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" name="epo:Estimate">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_0C735489_15DC_40a7_A94E_A9202738B188" name="epo:EvaluationTerm">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src904936_FC7D_45f3_AFEF_E5B428B672AA" association="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
+							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" name="epo:ExclusionGround">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" general="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
+						<memberEnd xmi:idref="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914"/>
+						<memberEnd xmi:idref="EAID_src6E629B_BECA_4e04_B7C9_925B517BC914"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6E629B_BECA_4e04_B7C9_925B517BC914" association="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
+							<type xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-						<memberEnd xmi:idref="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8"/>
-						<memberEnd xmi:idref="EAID_srcE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" association="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
-							<type xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
+						<memberEnd xmi:idref="EAID_dstB0A22A_438E_4ee3_8C70_92C7E2AD60DC"/>
+						<memberEnd xmi:idref="EAID_srcB0A22A_438E_4ee3_8C70_92C7E2AD60DC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB0A22A_438E_4ee3_8C70_92C7E2AD60DC" association="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" name="epo:ExclusionGroundsSummary">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" general="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
+						<memberEnd xmi:idref="EAID_dst0AED44_E69C_416d_988A_2D1D02E4692C"/>
+						<memberEnd xmi:idref="EAID_src0AED44_E69C_416d_988A_2D1D02E4692C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0AED44_E69C_416d_988A_2D1D02E4692C" association="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" name="epo:ExpressionOfInterest">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
+						<memberEnd xmi:idref="EAID_dstCCA39E_1E30_4142_9536_906052B9AABC"/>
+						<memberEnd xmi:idref="EAID_srcCCA39E_1E30_4142_9536_906052B9AABC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCCA39E_1E30_4142_9536_906052B9AABC" association="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+						</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_LI000279__85B9_4435_B7E7_D176E6996280" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000280__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 xmi:type="uml:Association" xmi:id="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
+						<memberEnd xmi:idref="EAID_dst22E99F_335A_40fc_AD89_A9564A5F5F61"/>
+						<memberEnd xmi:idref="EAID_src22E99F_335A_40fc_AD89_A9564A5F5F61"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src22E99F_335A_40fc_AD89_A9564A5F5F61" association="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
+							<type xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
-						<memberEnd xmi:idref="EAID_dst6B5FDE_85B9_4435_B7E7_D176E6996280"/>
-						<memberEnd xmi:idref="EAID_src6B5FDE_85B9_4435_B7E7_D176E6996280"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B5FDE_85B9_4435_B7E7_D176E6996280" association="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
-							<type xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+						<memberEnd xmi:idref="EAID_dstCB9CAD_CC6F_4c97_B4AA_B8C9088E4284"/>
+						<memberEnd xmi:idref="EAID_srcCB9CAD_CC6F_4c97_B4AA_B8C9088E4284"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB9CAD_CC6F_4c97_B4AA_B8C9088E4284" association="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
-						<memberEnd xmi:idref="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921"/>
-						<memberEnd xmi:idref="EAID_src8065CA_2D18_479d_95EB_23D106ED6921"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8065CA_2D18_479d_95EB_23D106ED6921" association="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
-							<type xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
+						<memberEnd xmi:idref="EAID_dst476D87_C25E_439e_AA92_BB00BFD1DB22"/>
+						<memberEnd xmi:idref="EAID_src476D87_C25E_439e_AA92_BB00BFD1DB22"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src476D87_C25E_439e_AA92_BB00BFD1DB22" association="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
+							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" name="epo:FrameworkAgreementTechnique">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0" general="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
+						<memberEnd xmi:idref="EAID_dst2C6E19_FB7C_453e_9B40_0A74A0E00195"/>
+						<memberEnd xmi:idref="EAID_src2C6E19_FB7C_453e_9B40_0A74A0E00195"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2C6E19_FB7C_453e_9B40_0A74A0E00195" association="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+						</ownedEnd>
 					</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_LI000281_F3B6_4ec0_BF8C_0265A6C826AC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000282_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_LI000283_9882_4995_AD97_001D3FCBE1D3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000284_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_LI000285_B548_4f26_BC5E_4EB19B6A021A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000286_B548_4f26_BC5E_4EB19B6A021A" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</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_LI000287__B3CA_4c57_AD37_79213AD539C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000288__B3CA_4c57_AD37_79213AD539C8" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" general="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC" name="epo:hasLaunchGroupFrameworkAgreementMaximumValue" association="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000289__5437_4a3f_9E66_5EBEFD7759BC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000290__5437_4a3f_9E66_5EBEFD7759BC" value="1"/>
-						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" general="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
+						<memberEnd xmi:idref="EAID_dst9EA23B_3707_4f38_8E54_F2D9BE08A114"/>
+						<memberEnd xmi:idref="EAID_src9EA23B_3707_4f38_8E54_F2D9BE08A114"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9EA23B_3707_4f38_8E54_F2D9BE08A114" association="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+						</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_FA070646_D88B_493f_96AB_8417E2069155"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" name="epo:AuxiliaryParty">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
+						<memberEnd xmi:idref="EAID_dst8F0271_F439_4d4a_8CF1_D9F81DFCBA1A"/>
+						<memberEnd xmi:idref="EAID_src8F0271_F439_4d4a_8CF1_D9F81DFCBA1A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" association="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
+							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
 						</ownedEnd>
 					</packagedElement>
-					<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: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_FA070646_D88B_493f_96AB_8417E2069155"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" name="epo:Awarder">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" name="epo:AwardingCentralPurchasingBody">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" general="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" name="epo:BudgetProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
+						<memberEnd xmi:idref="EAID_dst9B2877_CC4F_472f_9ED2_7DCA708FAEF8"/>
+						<memberEnd xmi:idref="EAID_src9B2877_CC4F_472f_9ED2_7DCA708FAEF8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B2877_CC4F_472f_9ED2_7DCA708FAEF8" association="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
+							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000291_DF5F_4be0_AF69_D4FBC1D44760" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000292_DF5F_4be0_AF69_D4FBC1D44760" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					<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_LI000193_B2B5_4d67_85D3_9488B22767E2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000194_B2B5_4d67_85D3_9488B22767E2" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000293_1B7A_459a_86B8_A6AD56C43AA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000294_1B7A_459a_86B8_A6AD56C43AA1" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1BE46C8C_217C_4fa5_994D_9A31184F91B4" name="epo:hasActivityDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000195_217C_4fa5_994D_9A31184F91B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000196_217C_4fa5_994D_9A31184F91B4" 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_LI000295_B5EB_429a_B2C2_846F2F33BCEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000296_B5EB_429a_B2C2_846F2F33BCEE" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9E03A190_EF20_4de9_BF47_95E969E738EA" name="epo:hasBuyerProfile">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000197_EF20_4de9_BF47_95E969E738EA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000198_EF20_4de9_BF47_95E969E738EA" 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_LI000297__BC4D_44e9_957C_60FF1C08941F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000298__BC4D_44e9_957C_60FF1C08941F" value="1"/>
+						<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_LI000199__2B82_485f_A14D_2E0BE4C98649" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000200__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"/>
+						</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_LI000201__8AD7_4cd0_B3EE_963EFE7F14CA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000202__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_LI000203__AFB2_421a_BBA1_4FFA393BE7FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000204__AFB2_421a_BBA1_4FFA393BE7FA" value="*"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
+						<memberEnd xmi:idref="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649"/>
+						<memberEnd xmi:idref="EAID_src57D84E_2B82_485f_A14D_2E0BE4C98649"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57D84E_2B82_485f_A14D_2E0BE4C98649" association="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
+							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src625CFF_139F_4712_8BB6_681888ACB178" association="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
+						<memberEnd xmi:idref="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5"/>
+						<memberEnd xmi:idref="EAID_src812517_A9DA_432d_A7B8_F5FEC69BBDA5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src812517_A9DA_432d_A7B8_F5FEC69BBDA5" association="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
+							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 						</ownedEnd>
 					</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_LI000299_E79A_4249_A596_0EDB3DECCE55" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000300_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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856" supplier="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" client="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_9E45040E_9573_4ec2_971F_0407E27D9413" supplier="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" client="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
-						<memberEnd xmi:idref="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C"/>
-						<memberEnd xmi:idref="EAID_srcE43E48_CB11_4fae_87F3_C0ACAEAF591C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE43E48_CB11_4fae_87F3_C0ACAEAF591C" association="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
-							<type xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
+						<memberEnd xmi:idref="EAID_dstC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA"/>
+						<memberEnd xmi:idref="EAID_srcC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" association="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
+							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 						</ownedEnd>
 					</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 xmi:type="uml:Association" xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
+						<memberEnd xmi:idref="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA"/>
+						<memberEnd xmi:idref="EAID_src76346D_AFB2_421a_BBA1_4FFA393BE7FA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src76346D_AFB2_421a_BBA1_4FFA393BE7FA" association="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA">
+							<type xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549" supplier="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" client="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" name="epo:JuryMember">
-						<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_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000301__80E6_41e6_B85A_672AACE795E2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000302__80E6_41e6_B85A_672AACE795E2" value="1"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
+						<memberEnd xmi:idref="EAID_dstC00346_DC8E_4fd4_8A9A_9A4173CBD283"/>
+						<memberEnd xmi:idref="EAID_srcC00346_DC8E_4fd4_8A9A_9A4173CBD283"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC00346_DC8E_4fd4_8A9A_9A4173CBD283" association="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
-						<memberEnd xmi:idref="EAID_dstD7352D_80E6_41e6_B85A_672AACE795E2"/>
-						<memberEnd xmi:idref="EAID_srcD7352D_80E6_41e6_B85A_672AACE795E2"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD7352D_80E6_41e6_B85A_672AACE795E2" association="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
-							<type xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
+						<memberEnd xmi:idref="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6"/>
+						<memberEnd xmi:idref="EAID_src14A192_0DFA_49f4_AB11_165E12CB38A6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14A192_0DFA_49f4_AB11_165E12CB38A6" association="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6">
+							<type xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" name="epo:LeadBuyer">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" general="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8B8F145A_51EA_4206_A62F_C9887535362E">
+						<memberEnd xmi:idref="EAID_dst8F145A_51EA_4206_A62F_C9887535362E"/>
+						<memberEnd xmi:idref="EAID_src8F145A_51EA_4206_A62F_C9887535362E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8F145A_51EA_4206_A62F_C9887535362E" association="EAID_8B8F145A_51EA_4206_A62F_C9887535362E">
+							<type xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30"/>
+						</ownedEnd>
 					</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_LI000303_2465_4986_9670_843B221BB214" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000304_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_LI000305_2E62_4d10_8AC1_07C24D6A907F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000306_2E62_4d10_8AC1_07C24D6A907F" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46" name="epo:hasAwardedEstimatedValue" association="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000307__584F_4a4f_910B_A28B233CEB46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000308__584F_4a4f_910B_A28B233CEB46" value="1"/>
-						</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_LI000309__598C_4f96_8D8A_71BD69D25161" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000310__598C_4f96_8D8A_71BD69D25161" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst718222_A67E_4d16_8978_7B6F899FD855" name="epo:hasFrameworkAgreementEstimatedValue" association="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-							<type xmi:idref="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000311__A67E_4d16_8978_7B6F899FD855" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000312__A67E_4d16_8978_7B6F899FD855" value="1"/>
-						</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_LI000313__95A4_4f77_A6DC_62DFC84C122D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000314__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_LI000315__E8C8_4628_94BC_1C90816E0487" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000316__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 xmi:type="uml:Association" xmi:id="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+						<memberEnd xmi:idref="EAID_dst74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
+						<memberEnd xmi:idref="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src74AF3F_89A0_4039_8257_A68F3DC30CC3" association="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+							<type xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-						<memberEnd xmi:idref="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46"/>
-						<memberEnd xmi:idref="EAID_src29B069_584F_4a4f_910B_A28B233CEB46"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src29B069_584F_4a4f_910B_A28B233CEB46" association="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0C71CA_F2D3_48ca_8D27_E3F34E3AF36B" association="EAID_C00C71CA_F2D3_48ca_8D27_E3F34E3AF36B">
+							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
-						<memberEnd xmi:idref="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161"/>
-						<memberEnd xmi:idref="EAID_src87247C_598C_4f96_8D8A_71BD69D25161"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87247C_598C_4f96_8D8A_71BD69D25161" association="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
-							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
+						<memberEnd xmi:idref="EAID_dstFAB429_5D16_4718_A790_6F3EB673B453"/>
+						<memberEnd xmi:idref="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFAB429_5D16_4718_A790_6F3EB673B453" association="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
+							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-						<memberEnd xmi:idref="EAID_dst718222_A67E_4d16_8978_7B6F899FD855"/>
-						<memberEnd xmi:idref="EAID_src718222_A67E_4d16_8978_7B6F899FD855"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src718222_A67E_4d16_8978_7B6F899FD855" association="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
+						<memberEnd xmi:idref="EAID_dst419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
+						<memberEnd xmi:idref="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src419AFF_EA5D_40db_B89D_FEC52A5F5DBC" association="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC">
+							<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7619CE_95A4_4f77_A6DC_62DFC84C122D" association="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
-							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
+						<memberEnd xmi:idref="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46"/>
+						<memberEnd xmi:idref="EAID_src687C05_7D35_48ab_B0AA_8C6787D5DF46"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src687C05_7D35_48ab_B0AA_8C6787D5DF46" association="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
-						<memberEnd xmi:idref="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487"/>
-						<memberEnd xmi:idref="EAID_srcBA801A_E8C8_4628_94BC_1C90816E0487"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA801A_E8C8_4628_94BC_1C90816E0487" association="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487">
-							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" name="epo:Candidate">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
+						<memberEnd xmi:idref="EAID_dst7753B6_365D_4082_8CC4_DA85F79E7124"/>
+						<memberEnd xmi:idref="EAID_src7753B6_365D_4082_8CC4_DA85F79E7124"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7753B6_365D_4082_8CC4_DA85F79E7124" association="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
+							<type xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000317__F987_4c92_B06C_0EA23C9FD1C7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000318__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_LI000319__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000320__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"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" name="epo:CatalogueProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-						<memberEnd xmi:idref="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7"/>
-						<memberEnd xmi:idref="EAID_srcB7EE24_F987_4c92_B06C_0EA23C9FD1C7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB7EE24_F987_4c92_B06C_0EA23C9FD1C7" association="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
-							<type xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
+						<memberEnd xmi:idref="EAID_dstFA8589_17C4_41df_B066_E37D4DDD0C0A"/>
+						<memberEnd xmi:idref="EAID_srcFA8589_17C4_41df_B066_E37D4DDD0C0A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFA8589_17C4_41df_B066_E37D4DDD0C0A" association="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
+							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-						<memberEnd xmi:idref="EAID_dst36ABDE_C6FC_4a8d_93CA_CC7ACC63568D"/>
-						<memberEnd xmi:idref="EAID_src36ABDE_C6FC_4a8d_93CA_CC7ACC63568D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src36ABDE_C6FC_4a8d_93CA_CC7ACC63568D" association="EAID_4B36ABDE_C6FC_4a8d_93CA_CC7ACC63568D">
-							<type xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+						<memberEnd xmi:idref="EAID_dstD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
+						<memberEnd xmi:idref="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD8157E_3EB6_44da_84E5_92EF1E2753B3" association="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
+							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7EDA02_3460_4960_8D22_F25373156526" association="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" name="epo:CatalogueReceiver">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+						<memberEnd xmi:idref="EAID_dst428053_29BF_4efe_807B_B6FA3BB29BF5"/>
+						<memberEnd xmi:idref="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src428053_29BF_4efe_807B_B6FA3BB29BF5" association="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+							<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-						<memberEnd xmi:idref="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E"/>
-						<memberEnd xmi:idref="EAID_src6B2F1A_EF51_458e_A7C0_67100DC0E58E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B2F1A_EF51_458e_A7C0_67100DC0E58E" association="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
+						<memberEnd xmi:idref="EAID_dstD6284A_096F_4112_989F_32AD38804C63"/>
+						<memberEnd xmi:idref="EAID_srcD6284A_096F_4112_989F_32AD38804C63"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD6284A_096F_4112_989F_32AD38804C63" association="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
+							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
-						<memberEnd xmi:idref="EAID_dstEB9836_FFEC_4652_9501_AB53057BAF53"/>
-						<memberEnd xmi:idref="EAID_srcEB9836_FFEC_4652_9501_AB53057BAF53"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB9836_FFEC_4652_9501_AB53057BAF53" association="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" name="epo:CentralPurchasingBody">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" general="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" name="epo:Contractor">
+						<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_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_LI000205__919D_4de3_BCF2_6CA4F71150CA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000206__919D_4de3_BCF2_6CA4F71150CA" value="1"/>
+						</ownedAttribute>
+					</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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA3014F_919D_4de3_BCF2_6CA4F71150CA" association="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA">
+							<type xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-						<memberEnd xmi:idref="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6"/>
-						<memberEnd xmi:idref="EAID_src76DFA8_9FC1_4db0_86FF_2CE55FF62AB6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" association="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
+						<memberEnd xmi:idref="EAID_dstF02E69_A9AF_47c5_B217_F52FFB1CAD53"/>
+						<memberEnd xmi:idref="EAID_srcF02E69_A9AF_47c5_B217_F52FFB1CAD53"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF02E69_A9AF_47c5_B217_F52FFB1CAD53" association="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</ownedEnd>
 					</packagedElement>
-					<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 xmi:type="uml:Association" xmi:id="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
+						<memberEnd xmi:idref="EAID_dst8CA809_26BC_46b1_A885_D5B3B1D5960A"/>
+						<memberEnd xmi:idref="EAID_src8CA809_26BC_46b1_A885_D5B3B1D5960A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8CA809_26BC_46b1_A885_D5B3B1D5960A" association="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB98FB_35C4_4015_80BE_9C778A0BA2A5" association="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" name="epo:EmploymentInformationProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" name="epo:EnvironmentalProtectionInformationProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" name="epo:JuryMember">
+						<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_LI000207__80E6_41e6_B85A_672AACE795E2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000208__80E6_41e6_B85A_672AACE795E2" value="1"/>
+						</ownedAttribute>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F9D16671_87A9_411b_B205_013259F2908D">
+						<memberEnd xmi:idref="EAID_dstD16671_87A9_411b_B205_013259F2908D"/>
+						<memberEnd xmi:idref="EAID_srcD16671_87A9_411b_B205_013259F2908D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD16671_87A9_411b_B205_013259F2908D" association="EAID_F9D16671_87A9_411b_B205_013259F2908D">
+							<type xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" name="epo:LeadBuyer">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" general="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					</packagedElement>
 					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" name="epo:Mediator">
 						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</packagedElement>
@@ -2072,1524 +1575,2027 @@
 							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000321__7ED0_457c_8310_43761AC8295C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000322__7ED0_457c_8310_43761AC8295C" value="1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" name="epo:OfferingParty">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" name="epo:OfferIssuer">
+						<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_LI000209__B8C1_4e5a_9174_C3DEEEA32848" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000210__B8C1_4e5a_9174_C3DEEEA32848" value="*"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" general="EAID_E7437025_771F_4143_BE33_620A29646687"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
-						<memberEnd xmi:idref="EAID_dstF2D4DC_7ED0_457c_8310_43761AC8295C"/>
-						<memberEnd xmi:idref="EAID_srcF2D4DC_7ED0_457c_8310_43761AC8295C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF2D4DC_7ED0_457c_8310_43761AC8295C" association="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
-							<type xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
+						<memberEnd xmi:idref="EAID_dst4261EC_B8C1_4e5a_9174_C3DEEEA32848"/>
+						<memberEnd xmi:idref="EAID_src4261EC_B8C1_4e5a_9174_C3DEEEA32848"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4261EC_B8C1_4e5a_9174_C3DEEEA32848" association="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
+							<type xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
-						<memberEnd xmi:idref="EAID_dst75C037_BE4C_49d2_A743_BAD5FFBD3003"/>
-						<memberEnd xmi:idref="EAID_src75C037_BE4C_49d2_A743_BAD5FFBD3003"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src75C037_BE4C_49d2_A743_BAD5FFBD3003" association="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
-							<type xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" name="epo:OfflineAccessProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
+						<memberEnd xmi:idref="EAID_dstB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84"/>
+						<memberEnd xmi:idref="EAID_srcB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" association="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
+							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
 						</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_LI000323_2965_4815_8CDE_FB67C01F11E8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000324_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_LI000325_4E02_4b32_B06D_1C4F4867E9C9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000326_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_LI000327_C0BD_4ca6_B28B_7D3AF3196028" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000328_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_LI000329_AED3_4851_B6FA_FC23EED7B627" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000330_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_LI000331_2765_4156_8A2B_76137A9E6CBF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000332_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_LI000333_654A_46a5_B750_B796AB4BF269" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000334_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_LI000335_CC7B_498f_B8C4_29436D9CC375" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000336_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_LI000337__7EC7_4537_B26B_232F5FB37A9C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000338__7EC7_4537_B26B_232F5FB37A9C" value="1"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" name="epo:OtherEntity">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" name="epo:ParticipationRequestProcessor">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
+						<memberEnd xmi:idref="EAID_dstFE789F_365A_4f79_AABC_E6BE700C4FCC"/>
+						<memberEnd xmi:idref="EAID_srcFE789F_365A_4f79_AABC_E6BE700C4FCC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFE789F_365A_4f79_AABC_E6BE700C4FCC" association="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
+							<type xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366"/>
 						</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_LI000339_1103_4f30_A179_7C66AC754CA5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000340_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_LI000341_48CD_438f_B329_FEB32481EDA8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000342_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 xmi:type="uml:Class" xmi:id="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" name="epo:ParticipationRequestReceiver">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</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_LI000343_CA65_4203_912D_52E9A6F5BE28" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000344_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_LI000345_4234_4f51_9B91_AEF3E04AF3F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000346_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_LI000347__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000348__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_LI000349__201D_47cb_BCF7_9C5A5DD40C4B" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000350__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 xmi:type="uml:Association" xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
+						<memberEnd xmi:idref="EAID_dst5D53F4_253B_4698_B2EF_82E934FAC2F4"/>
+						<memberEnd xmi:idref="EAID_src5D53F4_253B_4698_B2EF_82E934FAC2F4"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5D53F4_253B_4698_B2EF_82E934FAC2F4" association="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
+							<type xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
-						<memberEnd xmi:idref="EAID_dstEA813D_50A9_4b54_8B7C_0A19B505F52F"/>
-						<memberEnd xmi:idref="EAID_srcEA813D_50A9_4b54_8B7C_0A19B505F52F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEA813D_50A9_4b54_8B7C_0A19B505F52F" association="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
-							<type xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
+					<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:Association" xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
+						<memberEnd xmi:idref="EAID_dst1164A7_CB8C_462e_BBD0_75D03FADA8D8"/>
+						<memberEnd xmi:idref="EAID_src1164A7_CB8C_462e_BBD0_75D03FADA8D8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1164A7_CB8C_462e_BBD0_75D03FADA8D8" association="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
+							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" name="epo:ProcurementProcedureInformationProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
+						<memberEnd xmi:idref="EAID_dstDE70B2_FCDD_46b7_8DA7_19386DB49579"/>
+						<memberEnd xmi:idref="EAID_srcDE70B2_FCDD_46b7_8DA7_19386DB49579"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE70B2_FCDD_46b7_8DA7_19386DB49579" association="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
+							<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
 						</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_LI000351_C67E_4009_888E_552A62DE7225" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000352_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_LI000353_0AEE_4e3f_B002_536AFCD78D28" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000354_0AEE_4e3f_B002_536AFCD78D28" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2BFC85C6_8C05_4ca1_87CE_F13FED5DBBB1" name="epo:hasLongTitle">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000355_8C05_4ca1_87CE_F13FED5DBBB1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000356_8C05_4ca1_87CE_F13FED5DBBB1" 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_LI000357_4288_4e0c_8944_0179AA352784" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000358_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_LI000359_AE4D_4902_8134_A119102AB4ED" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000360_AE4D_4902_8134_A119102AB4ED" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
-						</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_LI000361_411E_4ea1_9106_C6437D14FC89" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000362_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_LI000363_73BE_4fb2_9DEF_E733091C3271" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000364_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_LI000365_AF11_41cd_BB0D_294796B07624" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000366_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_LI000367__8D66_48ab_B3C3_6654ABB348DF" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000368__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_LI000369__F57C_4861_BE52_91F3F7270840" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000370__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_LI000371__651A_4a8b_A411_E8DA312BC449" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000372__651A_4a8b_A411_E8DA312BC449" value="1"/>
+					<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_LI000211__0DFA_49f4_AB11_165E12CB38A6" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000212__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>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
-						<memberEnd xmi:idref="EAID_dstB9978D_8D66_48ab_B3C3_6654ABB348DF"/>
-						<memberEnd xmi:idref="EAID_srcB9978D_8D66_48ab_B3C3_6654ABB348DF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB9978D_8D66_48ab_B3C3_6654ABB348DF" association="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF">
-							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" name="epo:Reviewer">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" supplier="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
-						<memberEnd xmi:idref="EAID_dstE70932_F57C_4861_BE52_91F3F7270840"/>
-						<memberEnd xmi:idref="EAID_srcE70932_F57C_4861_BE52_91F3F7270840"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE70932_F57C_4861_BE52_91F3F7270840" association="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
-							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613" supplier="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" client="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
+						<memberEnd xmi:idref="EAID_dst531817_E843_4c42_8EA1_111804B30C38"/>
+						<memberEnd xmi:idref="EAID_src531817_E843_4c42_8EA1_111804B30C38"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src531817_E843_4c42_8EA1_111804B30C38" association="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
+							<type xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" supplier="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
-						<memberEnd xmi:idref="EAID_dst55E894_651A_4a8b_A411_E8DA312BC449"/>
-						<memberEnd xmi:idref="EAID_src55E894_651A_4a8b_A411_E8DA312BC449"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src55E894_651A_4a8b_A411_E8DA312BC449" association="EAID_F955E894_651A_4a8b_A411_E8DA312BC449">
-							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" name="epo:ReviewProcedureInformationProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
-						<memberEnd xmi:idref="EAID_dst3AE348_60D1_44cb_BC5F_08B65291C2AC"/>
-						<memberEnd xmi:idref="EAID_src3AE348_60D1_44cb_BC5F_08B65291C2AC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AE348_60D1_44cb_BC5F_08B65291C2AC" association="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
-							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
+						<memberEnd xmi:idref="EAID_dst9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E"/>
+						<memberEnd xmi:idref="EAID_src9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" association="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
+							<type xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
-						<memberEnd xmi:idref="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97"/>
-						<memberEnd xmi:idref="EAID_src14464A_EF1A_4230_BB7E_A40906D6ED97"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14464A_EF1A_4230_BB7E_A40906D6ED97" association="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
-							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+					<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_72FDF104_AADB_434c_9491_D5301EE0DDE7" name="epo:Subcontractor">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
+						<memberEnd xmi:idref="EAID_dst545C91_D269_4cfe_A646_9A2FDEE01B0F"/>
+						<memberEnd xmi:idref="EAID_src545C91_D269_4cfe_A646_9A2FDEE01B0F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src545C91_D269_4cfe_A646_9A2FDEE01B0F" association="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000373__4324_4eba_B071_A8B833BDA1EF" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000374__4324_4eba_B071_A8B833BDA1EF" value="1"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstF70CB6_EA38_4786_82CF_5486AAD496C1" name="epo:describesResultNotice" association="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000375__EA38_4786_82CF_5486AAD496C1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000376__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_LI000377__DB12_48df_92AE_A27F7DFCCAC3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000378__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_LI000379__30DE_429b_AE68_D4CA3CC6E260" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000380__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_LI000381__9DFC_48b4_A935_786F35AF2AFB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000382__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_LI000383__0159_4fe1_8469_562A93DEF12E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000384__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_LI000385__0827_4589_A374_A1CFC018D076" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000386__0827_4589_A374_A1CFC018D076" value="1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" name="epo:TaxInformationProvider">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" name="epo:Tenderer">
+						<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_LI000213__B9E8_4e17_87D7_D2C5E8C7FFF8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000214__B9E8_4e17_87D7_D2C5E8C7FFF8" 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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+						<memberEnd xmi:idref="EAID_dstE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8"/>
+						<memberEnd xmi:idref="EAID_srcE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" association="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8">
+							<type xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF70CB6_EA38_4786_82CF_5486AAD496C1" association="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
+						<memberEnd xmi:idref="EAID_dst636EE3_DE81_4083_BF9B_6F607A63A921"/>
+						<memberEnd xmi:idref="EAID_src636EE3_DE81_4083_BF9B_6F607A63A921"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src636EE3_DE81_4083_BF9B_6F607A63A921" association="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
+							<type xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
+						<memberEnd xmi:idref="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46"/>
+						<memberEnd xmi:idref="EAID_src26EBD4_4329_4e57_9F78_AF7887C44E46"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src26EBD4_4329_4e57_9F78_AF7887C44E46" association="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src564C5C_30DE_429b_AE68_D4CA3CC6E260" association="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
-							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" name="epo:TenderProcessor">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
+						<memberEnd xmi:idref="EAID_dst7F270C_1A4E_400c_88ED_7EFEB868C4EC"/>
+						<memberEnd xmi:idref="EAID_src7F270C_1A4E_400c_88ED_7EFEB868C4EC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7F270C_1A4E_400c_88ED_7EFEB868C4EC" association="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
+							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
 						</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 xmi:type="uml:Class" xmi:id="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" name="epo:TenderReceiver">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
 					</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
+						<memberEnd xmi:idref="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F"/>
+						<memberEnd xmi:idref="EAID_srcC31FFB_F53F_431c_AED5_36E1786ED85F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC31FFB_F53F_431c_AED5_36E1786ED85F" association="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
+							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src074F10_F8BD_4e56_929F_478C3A0B8424" association="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-						</ownedEnd>
+					<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_LI000215__DE81_4083_BF9B_6F607A63A921" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000216__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:Association" xmi:id="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-						<memberEnd xmi:idref="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1"/>
-						<memberEnd xmi:idref="EAID_src96E83D_792B_44cd_BDF4_F589B6CAC7A1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src96E83D_792B_44cd_BDF4_F589B6CAC7A1" association="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
+						<memberEnd xmi:idref="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A"/>
+						<memberEnd xmi:idref="EAID_srcED3FAD_FABC_4b24_A3E6_B0420EB7CF2A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" association="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
+							<type xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-						<memberEnd xmi:idref="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3"/>
-						<memberEnd xmi:idref="EAID_srcBA098A_C04A_4c7d_A8BE_2A965642DCD3"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA098A_C04A_4c7d_A8BE_2A965642DCD3" association="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" name="epo:Certifier">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
-						<memberEnd xmi:idref="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22"/>
-						<memberEnd xmi:idref="EAID_src53A3B1_64BB_454a_8FCF_CE8415CE3F22"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53A3B1_64BB_454a_8FCF_CE8415CE3F22" association="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
+						<memberEnd xmi:idref="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71"/>
+						<memberEnd xmi:idref="EAID_src176015_1FBF_4d9c_9A77_C246A6F21E71"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src176015_1FBF_4d9c_9A77_C246A6F21E71" association="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71">
+							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" name="epo:NoticeChangeInformation">
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BF36FFA5_CE97_49d3_8482_D1EAA764E7D8" name="epo:hasChangeDescription">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000387_CE97_49d3_8482_D1EAA764E7D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000388_CE97_49d3_8482_D1EAA764E7D8" value="*"/>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" name="role playing sides"/>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_B6085AA3_C98C_49fa_8FA0_069B51B180A2" name="role predecessor dependecies"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" name="location">
+					<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_LI000217_BE8B_47ed_A7E8_401033A4F00F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000218_BE8B_47ed_A7E8_401033A4F00F" 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_LI000389_4A7F_44a3_90AE_DC4CE167531B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000390_4A7F_44a3_90AE_DC4CE167531B" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_18678A91_8A39_4ef1_9823_B5AEDF9F9A8D" name="cpov:telephone">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000219_8A39_4ef1_9823_B5AEDF9F9A8D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000220_8A39_4ef1_9823_B5AEDF9F9A8D" 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_LI000391_638C_465b_985C_46C4F92E2998" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000392_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_LI000393_316E_4eed_9253_86D09F747DE7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000394_316E_4eed_9253_86D09F747DE7" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_0FFF8E2C_503B_420d_A265_995666BBE4C8" name="cpov:email">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000221_503B_420d_A265_995666BBE4C8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000222_503B_420d_A265_995666BBE4C8" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000395_6A09_4dd9_A1E2_34E02F94BF9A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000396_6A09_4dd9_A1E2_34E02F94BF9A" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_23111491_7AC7_4d4d_9FEB_F13DE10B9AC2" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000223_7AC7_4d4d_9FEB_F13DE10B9AC2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000224_7AC7_4d4d_9FEB_F13DE10B9AC2" value="*"/>
 							<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_LI000397__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000398__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_FDF3AB5E_9A7F_450b_9015_99A5CECE86AA" name="epo:hasContactName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000225_9A7F_450b_9015_99A5CECE86AA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000226_9A7F_450b_9015_99A5CECE86AA" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000399__94B3_445f_ACA6_A903591C3651" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000400__94B3_445f_ACA6_A903591C3651" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_92C70B39_1030_43e1_BA3D_464008D8F6FA" name="epo:hasInternetAddress">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000227_1030_43e1_BA3D_464008D8F6FA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000228_1030_43e1_BA3D_464008D8F6FA" value="1"/>
+							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</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_LI000401__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000402__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst228FCF_2B3C_44e6_BD17_379180274988" name="cv: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_LI000229__2B3C_44e6_BD17_379180274988" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000230__2B3C_44e6_BD17_379180274988" value="1"/>
 						</ownedAttribute>
 					</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:Class" xmi:id="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" name="epo:Offer">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
-						<memberEnd xmi:idref="EAID_dst4261EC_B8C1_4e5a_9174_C3DEEEA32848"/>
-						<memberEnd xmi:idref="EAID_src4261EC_B8C1_4e5a_9174_C3DEEEA32848"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4261EC_B8C1_4e5a_9174_C3DEEEA32848" association="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848">
-							<type xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+						<memberEnd xmi:idref="EAID_dst228FCF_2B3C_44e6_BD17_379180274988"/>
+						<memberEnd xmi:idref="EAID_src228FCF_2B3C_44e6_BD17_379180274988"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src228FCF_2B3C_44e6_BD17_379180274988" association="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+							<type xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" name="epo:OfferingParty">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" general="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" name="epo:OfferIssuer">
-						<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_LI000403__B8C1_4e5a_9174_C3DEEEA32848" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000404__B8C1_4e5a_9174_C3DEEEA32848" value="*"/>
-						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" name="epo:OfflineAccessProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</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_LI000405_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000406_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+					<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_LI000231_8792_484d_909C_83FEC34C0F01" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000232_8792_484d_909C_83FEC34C0F01" value="1"/>
+							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</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_LI000407_22FE_48c0_BDCC_9A83EE89165B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000408_22FE_48c0_BDCC_9A83EE89165B" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DE0FC2D7_1CCC_4ee6_BCB7_85BA67069C74" name="dct:description">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000233_1CCC_4ee6_BCB7_85BA67069C74" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000234_1CCC_4ee6_BCB7_85BA67069C74" value="1"/>
 							<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_LI000409_1DBC_43b2_8E36_EC4B49BEF335" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000410_1DBC_43b2_8E36_EC4B49BEF335" value="1"/>
-							<type xmi:idref="EAJava_xsd_anyURI"/>
-						</ownedAttribute>
-						<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_LI000411__E82A_4979_98A5_58BD6A43131C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000412__E82A_4979_98A5_58BD6A43131C" value="1"/>
+						<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_LI000235__B837_4e3f_B996_A8D529DA32A2" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000236__B837_4e3f_B996_A8D529DA32A2" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
-						<memberEnd xmi:idref="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C"/>
-						<memberEnd xmi:idref="EAID_srcCBD7C1_E82A_4979_98A5_58BD6A43131C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCBD7C1_E82A_4979_98A5_58BD6A43131C" association="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
-							<type xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD"/>
+					<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: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_LI000413_9499_473a_B5FA_2C4594C6B9A0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000414_9499_473a_B5FA_2C4594C6B9A0" value="*"/>
+					<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_LI000237_22A1_4faf_B623_4983949241CC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000238_22A1_4faf_B623_4983949241CC" value="1"/>
 							<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_LI000415__946A_403c_B906_6DB183F74D9F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000416__946A_403c_B906_6DB183F74D9F" value="*"/>
+						<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_LI000239__B03B_430a_A719_E1852BEECBEE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000240__B03B_430a_A719_E1852BEECBEE" value="1"/>
 						</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_LI000417__AB87_4730_A6DF_915A5FB0B3DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000418__AB87_4730_A6DF_915A5FB0B3DB" value="1"/>
+						<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_LI000241__A0BD_494b_BEE6_89F708783872" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000242__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_LI000243__E7FF_4ca6_8255_6B2812DC1B0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000244__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_LI000245__CD7F_4664_8346_839CB32AF64E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000246__CD7F_4664_8346_839CB32AF64E" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
-						<memberEnd xmi:idref="EAID_dstA8BD10_946A_403c_B906_6DB183F74D9F"/>
-						<memberEnd xmi:idref="EAID_srcA8BD10_946A_403c_B906_6DB183F74D9F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA8BD10_946A_403c_B906_6DB183F74D9F" association="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F">
-							<type xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D"/>
+					<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:Association" xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
-						<memberEnd xmi:idref="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB"/>
-						<memberEnd xmi:idref="EAID_srcF440DD_AB87_4730_A6DF_915A5FB0B3DB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF440DD_AB87_4730_A6DF_915A5FB0B3DB" association="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB">
-							<type xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D"/>
+					<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"/>
+						<memberEnd xmi:idref="EAID_src0B3C1A_A0BD_494b_BEE6_89F708783872"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src0B3C1A_A0BD_494b_BEE6_89F708783872" association="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
+							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" name="epo:OriginatorRequest">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-						<memberEnd xmi:idref="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A"/>
-						<memberEnd xmi:idref="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A" association="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
-							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
+					<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:Class" xmi:id="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" name="epo:OtherEntity">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" name="epo:ParticipationCondition">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					</packagedElement>
-					<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_LI000419_F9A9_4ed3_8B7D_8A8A4C4E0014" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000420_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_LI000421_CCFA_4297_8DDC_3871A35AD86D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000422_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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0EC24453_1D32_4b47_B797_31C56125A97E" supplier="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" client="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" name="epo:ParticipationRequestProcessor">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
-						<memberEnd xmi:idref="EAID_dstFE789F_365A_4f79_AABC_E6BE700C4FCC"/>
-						<memberEnd xmi:idref="EAID_srcFE789F_365A_4f79_AABC_E6BE700C4FCC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFE789F_365A_4f79_AABC_E6BE700C4FCC" association="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
-							<type xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8E8C16_CD7F_4664_8346_839CB32AF64E" association="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E">
+							<type xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" name="epo:ParticipationRequestReceiver">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
-						<memberEnd xmi:idref="EAID_dst5D53F4_253B_4698_B2EF_82E934FAC2F4"/>
-						<memberEnd xmi:idref="EAID_src5D53F4_253B_4698_B2EF_82E934FAC2F4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5D53F4_253B_4698_B2EF_82E934FAC2F4" association="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
-							<type xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+						<memberEnd xmi:idref="EAID_dst549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
+						<memberEnd xmi:idref="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src549AF3_1E2A_4cd7_9F26_8CD173F2F4F7" association="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+							<type xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000423__253B_4698_B2EF_82E934FAC2F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000424__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_LI000425__365A_4f79_AABC_E6BE700C4FCC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000426__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_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_LI000427_A9D2_43ed_A3E9_06F70F22D65B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000428_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_LI000429__0415_4ef8_A495_71F8920238AD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000430__0415_4ef8_A495_71F8920238AD" value="1"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
+						<memberEnd xmi:idref="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7"/>
+						<memberEnd xmi:idref="EAID_src2EFC84_74F8_415f_B4C7_BC3E17610EF7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2EFC84_74F8_415f_B4C7_BC3E17610EF7" association="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
+							<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+						<memberEnd xmi:idref="EAID_dstFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
+						<memberEnd xmi:idref="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFEF002_D274_4157_BCA8_CFEC07ED34AE" association="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+							<type xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A"/>
 						</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 xmi:type="uml:Association" xmi:id="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+						<memberEnd xmi:idref="EAID_dst35A308_9DDF_4d5b_980E_9D85403496D0"/>
+						<memberEnd xmi:idref="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src35A308_9DDF_4d5b_980E_9D85403496D0" association="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+							<type xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
-						<memberEnd xmi:idref="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22"/>
-						<memberEnd xmi:idref="EAID_src8C734E_FD33_4153_9939_FA613CEB5D22"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8C734E_FD33_4153_9939_FA613CEB5D22" association="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
-							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
+						<memberEnd xmi:idref="EAID_dst3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
+						<memberEnd xmi:idref="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" association="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
+							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
 						</ownedEnd>
 					</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:isSubmissionForAllLotsAllowed">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000431_050A_463f_A57A_8F0E6FEE3D87" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000432_050A_463f_A57A_8F0E6FEE3D87" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+					<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_LI000247_9666_44c8_AE46_FDF98BE48098" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000248_9666_44c8_AE46_FDF98BE48098" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000433_DEF8_48d5_8FC1_F33EBDC25F8B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000434_DEF8_48d5_8FC1_F33EBDC25F8B" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_5D5F6583_5ACA_48be_9C44_DEB260EE3AB7" name="locn:addressArea">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000249_5ACA_48be_9C44_DEB260EE3AB7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000250_5ACA_48be_9C44_DEB260EE3AB7" value="1"/>
 							<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_LI000435_BCD5_40c3_81A4_ACA3A07B5134" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000436_BCD5_40c3_81A4_ACA3A07B5134" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_70E756E5_00B9_4f66_9D4B_3409713C111D" name="locn:locatorName">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000251_00B9_4f66_9D4B_3409713C111D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000252_00B9_4f66_9D4B_3409713C111D" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000437_D264_48e3_95D6_90F7ABDA229D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000438_D264_48e3_95D6_90F7ABDA229D" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_802D9A52_073D_455b_A0F6_DB8FE24D4365" name="locn:adminUnitL2">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000253_073D_455b_A0F6_DB8FE24D4365" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000254_073D_455b_A0F6_DB8FE24D4365" value="1"/>
 							<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_LI000439_01AB_4439_BB83_85D0BD6B04BD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000440_01AB_4439_BB83_85D0BD6B04BD" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_829CA5E1_0FDA_4c48_8F2E_DB19DABE380D" name="locn:fullAddress">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000255_0FDA_4c48_8F2E_DB19DABE380D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000256_0FDA_4c48_8F2E_DB19DABE380D" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000441_6541_4744_BB18_D60A02A82939" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000442_6541_4744_BB18_D60A02A82939" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_26BA9E10_DECA_4349_A6FE_21031DBF9E64" name="locn:locatorDesignator">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000257_DECA_4349_A6FE_21031DBF9E64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000258_DECA_4349_A6FE_21031DBF9E64" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000443_E27F_49fd_9845_3793BE63D7B5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000444_E27F_49fd_9845_3793BE63D7B5" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_79C9C8AE_515F_4e62_A7A2_8994B97F40FC" name="locn:adminUnitL1">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000259_515F_4e62_A7A2_8994B97F40FC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000260_515F_4e62_A7A2_8994B97F40FC" 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_LI000445_214F_4358_9D9A_285895441740" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000446_214F_4358_9D9A_285895441740" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_BC49BAC4_42EA_469b_B74A_6F71FE025E9D" name="locn:postCode">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000261_42EA_469b_B74A_6F71FE025E9D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000262_42EA_469b_B74A_6F71FE025E9D" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000447_247B_42a3_AFEB_0FB9003A6A40" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000448_247B_42a3_AFEB_0FB9003A6A40" value="*"/>
-							<type xmi:idref="EAJava_xsd_anyURI"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2AAAB836_ACFF_41ba_AA83_669E38B9DCC0" name="locn:thoroughfare">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000263_ACFF_41ba_AA83_669E38B9DCC0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000264_ACFF_41ba_AA83_669E38B9DCC0" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000449__6F4E_42f1_80CD_0C45E80E9AEE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000450__6F4E_42f1_80CD_0C45E80E9AEE" value="1"/>
+						<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_LI000265__11BF_430e_ABED_4C9AC22FFF2A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000266__11BF_430e_ABED_4C9AC22FFF2A" 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_LI000451__EE66_4ace_9069_38D7A3B7A01C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000452__EE66_4ace_9069_38D7A3B7A01C" value="*"/>
+					</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_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
+						<memberEnd xmi:idref="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C"/>
+						<memberEnd xmi:idref="EAID_srcCBD7C1_E82A_4979_98A5_58BD6A43131C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCBD7C1_E82A_4979_98A5_58BD6A43131C" association="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C">
+							<type xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD"/>
+						</ownedEnd>
+					</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_LI000267_D357_4390_80F0_715754917A04" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000268_D357_4390_80F0_715754917A04" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000453__CC4F_472f_9ED2_7DCA708FAEF8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000454__CC4F_472f_9ED2_7DCA708FAEF8" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_1CE71D53_1214_4337_9DD2_EE0515B85B64" name="cv:longitude">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000269_1214_4337_9DD2_EE0515B85B64" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000270_1214_4337_9DD2_EE0515B85B64" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000455__F439_4d4a_8CF1_D9F81DFCBA1A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000456__F439_4d4a_8CF1_D9F81DFCBA1A" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_8602AC5B_BF7B_41b5_91EC_CB0218B68ABA" name="cv:latitude">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000271_BF7B_41b5_91EC_CB0218B68ABA" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000272_BF7B_41b5_91EC_CB0218B68ABA" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-						<memberEnd xmi:idref="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C"/>
-						<memberEnd xmi:idref="EAID_srcCFA3B0_EE66_4ace_9069_38D7A3B7A01C"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFA3B0_EE66_4ace_9069_38D7A3B7A01C" association="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-							<type xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" name="term">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_D67F46E0_2B15_4614_A170_F1414A602530" body="Revise the Term hierarchy.&#xA;&#xA;e.g. ReviewTerm is per Procedure in SF (to be investigated how it is in eForms). ">
+						<annotatedElement xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					</ownedComment>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" name="epo:ContractSpecificTerm">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" general="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
+						<memberEnd xmi:idref="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562"/>
+						<memberEnd xmi:idref="EAID_srcB9AB7E_2B60_4f59_8AE5_E5806C9B2562"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB9AB7E_2B60_4f59_8AE5_E5806C9B2562" association="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</ownedEnd>
 					</packagedElement>
+					<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: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>
 					<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_LI000457_8A13_4665_952E_6B5391B8B3FE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000458_8A13_4665_952E_6B5391B8B3FE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000273_8A13_4665_952E_6B5391B8B3FE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000274_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_LI000459_C747_4144_9A64_EB3E1F8047A9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000460_C747_4144_9A64_EB3E1F8047A9" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000275_C747_4144_9A64_EB3E1F8047A9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000276_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_LI000461_17A9_4dcc_ACCD_71AFE4011CBE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000462_17A9_4dcc_ACCD_71AFE4011CBE" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000277_17A9_4dcc_ACCD_71AFE4011CBE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000278_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_LI000463_053A_4b0b_93CE_CA1C3787B4A3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000464_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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
-						<memberEnd xmi:idref="EAID_dst9BB27E_7F36_41c3_8166_36C3538F2F3A"/>
-						<memberEnd xmi:idref="EAID_src9BB27E_7F36_41c3_8166_36C3538F2F3A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9BB27E_7F36_41c3_8166_36C3538F2F3A" association="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
-							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" name="epo:Term"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_1B056616_B822_4add_84D3_1D36186827ED" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_75629D1B_E406_4b38_82BA_5525819A470C" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_9512B0DA_565A_4051_A589_525053877046" general="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" general="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" name="participation request term">
+						<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_LI000279__253B_4698_B2EF_82E934FAC2F4" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000280__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_LI000281__365A_4f79_AABC_E6BE700C4FCC" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000282__365A_4f79_AABC_E6BE700C4FCC" value="1"/>
+							</ownedAttribute>
+						</packagedElement>
 					</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_53D15EA1_B17A_48ea_983D_0A065FE34A6C" name="epo:hasFormula">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000465_B17A_48ea_983D_0A065FE34A6C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000466_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_LI000467__D382_4766_9563_4C96020D607C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000468__D382_4766_9563_4C96020D607C" value="*"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" name="review term">
+						<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_LI000283_9460_4e04_BCD7_38CCB8AFA518" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000284_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_LI000285_8210_42d8_9286_649347222247" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000286_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_LI000287_4513_4003_8F57_CB232AF26678" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000288_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_LI000289__E843_4c42_8EA1_111804B30C38" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000290__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_LI000291__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000292__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>
-					<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"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" supplier="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" client="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
-						<memberEnd xmi:idref="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4"/>
-						<memberEnd xmi:idref="EAID_src1AA305_6E1E_4123_A7F5_548146C45BC4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1AA305_6E1E_4123_A7F5_548146C45BC4" association="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4">
-							<type xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" name="access term">
+						<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_LI000293_F7A6_42d3_8527_025EA7C4ECE9" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000294_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_LI000295_B472_44ff_97A0_C963A7A5D2CA" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000296_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_LI000297_D282_4a12_98D4_FC46FC4463B9" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000298_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_LI000299_FC45_4f69_A2A2_AC3A9337FFCF" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000300_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_LI000301__B1D3_4ffe_B219_FFD9D57F9B43" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000302__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_LI000303__17C4_41df_B066_E37D4DDD0C0A" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000304__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_LI000305__FCDD_46b7_8DA7_19386DB49579" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000306__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_LI000307__7AFD_4b8c_8502_C5AC8F9FFC84" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000308__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_LI000309__096F_4112_989F_32AD38804C63" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000310__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_LI000311__6ABD_4c9b_83A7_6E582F53DA90" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000312__6ABD_4c9b_83A7_6E582F53DA90" value="*"/>
+							</ownedAttribute>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
+							<memberEnd xmi:idref="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43"/>
+							<memberEnd xmi:idref="EAID_src1B9223_B1D3_4ffe_B219_FFD9D57F9B43"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1B9223_B1D3_4ffe_B219_FFD9D57F9B43" association="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
+								<type xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" supplier="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" client="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58"/>
+						<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_LI000313_1103_4f30_A179_7C66AC754CA5" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000314_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_LI000315_48CD_438f_B329_FEB32481EDA8" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000316_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_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_LI000317_F2F3_45c2_BC48_C23FF1B7FF54" value="1"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000318_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_LI000319_22FE_48c0_BDCC_9A83EE89165B" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000320_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_LI000321_1DBC_43b2_8E36_EC4B49BEF335" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000322_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_LI000323__E82A_4979_98A5_58BD6A43131C" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000324__E82A_4979_98A5_58BD6A43131C" value="1"/>
+							</ownedAttribute>
+						</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_LI000325_CABF_495e_8376_7F059C142FA2" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000326_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_LI000327_3D05_426d_B057_4FE0D785D8C5" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000328_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_LI000329_1B92_4286_8D4C_A392932D7D7E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000330_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"/>
+						</packagedElement>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
-						<memberEnd xmi:idref="EAID_dst7073E1_3362_472f_B087_27A619B6C819"/>
-						<memberEnd xmi:idref="EAID_src7073E1_3362_472f_B087_27A619B6C819"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7073E1_3362_472f_B087_27A619B6C819" association="EAID_FC7073E1_3362_472f_B087_27A619B6C819">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" name="procedure term">
+						<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_LI000331_0C10_47cd_8014_0CF056ADDCF4" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000332_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_LI000333__725C_4a26_B380_6FDE59360DAF" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000334__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_LI000335__AE5B_4536_B67E_B79F177247C7" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000336__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>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_279636BF_8F0D_4744_8B59_3277E5CE2E90" supplier="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" client="EAID_0A227254_932A_487b_B10A_658AA61F3CAD"/>
+						<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_LI000337_050A_463f_A57A_8F0E6FEE3D87" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000338_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_LI000339_DEF8_48d5_8FC1_F33EBDC25F8B" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000340_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_LI000341_BCD5_40c3_81A4_ACA3A07B5134" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000342_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_LI000343_D264_48e3_95D6_90F7ABDA229D" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000344_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_LI000345_01AB_4439_BB83_85D0BD6B04BD" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000346_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_LI000347_6541_4744_BB18_D60A02A82939" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000348_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_LI000349_E27F_49fd_9845_3793BE63D7B5" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000350_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_LI000351_214F_4358_9D9A_285895441740" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000352_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_LI000353_247B_42a3_AFEB_0FB9003A6A40" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000354_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_LI000355__6F4E_42f1_80CD_0C45E80E9AEE" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000356__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_LI000357__EE66_4ace_9069_38D7A3B7A01C" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000358__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_LI000359__CC4F_472f_9ED2_7DCA708FAEF8" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000360__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_LI000361__F439_4d4a_8CF1_D9F81DFCBA1A" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000362__F439_4d4a_8CF1_D9F81DFCBA1A" value="*"/>
+							</ownedAttribute>
+						</packagedElement>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" name="epo:ProcurementDocument">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" name="submission term">
+						<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_LI000363_87DD_4edb_867A_D36061C7C85B" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000364_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_LI000365_3C6E_4b8a_9E44_F51D72FE840E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000366_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_LI000367_D7C1_4fc1_B974_73482723AB30" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000368_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_LI000369_1E8D_431b_B4A7_BC3DD1D88947" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000370_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_LI000371_6346_40b8_8467_BD3EAA918250" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000372_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_LI000373_481F_4e16_B636_E9A45391BA3E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000374_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_LI000375_EDC8_41c1_A493_F3DF27FB67C5" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000376_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_LI000377_0EC4_4a22_8340_EA2FAF94B78F" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000378_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_LI000379_C694_419c_B5A3_DCF52C96BA83" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000380_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_LI000381_ED5C_48cf_AFC4_3D5FB5EE6906" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000382_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_LI000383_AF96_4e09_801D_A796A1DC3D1C" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000384_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_LI000385_4948_4ee3_BA84_B73B538B8AC5" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000386_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_LI000387_E492_413d_B12C_46646DE65A2D" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000388_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_LI000389__C46F_456b_A355_DA9CD314CBA0" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000390__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_LI000391__F53F_431c_AED5_36E1786ED85F" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000392__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_LI000393__1A4E_400c_88ED_7EFEB868C4EC" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000394__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_LI000395__2E5B_4fa1_B0EA_CB49790C2AAD" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000396__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:Dependency" xmi:id="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E" supplier="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8CA66645_D223_487b_B348_21446E4664A6" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+						<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>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" name="contract term">
+						<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_LI000397_DA32_4dad_A471_35D47B85EEA0" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000398_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_LI000399_612A_41e4_9039_862FA1A389EE" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000400_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_LI000401_B40A_4fed_BDA5_11FC9CBE7652" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000402_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_LI000403_EAB8_45b5_865A_D1F442CCDE19" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000404_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_LI000405_9138_46d4_AA7B_A555B7F284A2" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000406_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_LI000407_B9A9_4b8c_8855_DCE8E0600AF6" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000408_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_LI000409_F373_4e7f_8BFE_5AB5D113FDD1" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000410_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_LI000411_377D_40f9_BFBF_D7305458427F" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000412_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_LI000413_74A7_4026_8C22_E64B96F7B965" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000414_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_LI000415_76CE_4f7f_81F9_D9B627E4DEA1" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000416_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_LI000417_9E94_4367_9FC8_D27251DB20AF" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000418_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_LI000419_174F_46a9_B3CB_00BE0B239330" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000420_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_LI000421__CB8C_462e_BBD0_75D03FADA8D8" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000422__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_LI000423__1698_4353_BEDB_63334B745ECB" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000424__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_LI000425__74F8_415f_B4C7_BC3E17610EF7" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000426__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_LI000427__502A_413a_8694_914903478877" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000428__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_LI000429__A73E_42a1_854B_9995087470E4" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000430__A73E_42a1_854B_9995087470E4" value="1"/>
+							</ownedAttribute>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B" supplier="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
+							<memberEnd xmi:idref="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB"/>
+							<memberEnd xmi:idref="EAID_src1E8ADE_1698_4353_BEDB_63334B745ECB"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1E8ADE_1698_4353_BEDB_63334B745ECB" association="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
+								<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" supplier="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4" supplier="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1" supplier="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" client="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_F593B546_502A_413a_8694_914903478877">
+							<memberEnd xmi:idref="EAID_dst93B546_502A_413a_8694_914903478877"/>
+							<memberEnd xmi:idref="EAID_src93B546_502A_413a_8694_914903478877"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src93B546_502A_413a_8694_914903478877" association="EAID_F593B546_502A_413a_8694_914903478877">
+								<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
+							<memberEnd xmi:idref="EAID_dstA22183_A73E_42a1_854B_9995087470E4"/>
+							<memberEnd xmi:idref="EAID_srcA22183_A73E_42a1_854B_9995087470E4"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA22183_A73E_42a1_854B_9995087470E4" association="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
+								<type xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2"/>
+							</ownedEnd>
+						</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_LI000431_CCB2_4a7b_A2C9_F47802435B26" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000432_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_LI000433_C420_46bc_A3DA_63313A6F8C5E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000434_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_LI000435_F0BE_4958_BE04_24CB02C3E3DC" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000436_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_LI000437_89F9_4090_93D7_77B848BA8488" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000438_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_LI000439_9491_4e26_87CA_DC841CBE6FB1" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000440_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_LI000441__3C73_4e45_9F54_76A56333BE1E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000442__3C73_4e45_9F54_76A56333BE1E" value="*"/>
+							</ownedAttribute>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
+							<memberEnd xmi:idref="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E"/>
+							<memberEnd xmi:idref="EAID_src51F167_3C73_4e45_9F54_76A56333BE1E"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src51F167_3C73_4e45_9F54_76A56333BE1E" association="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
+								<type xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C"/>
+							</ownedEnd>
+						</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_LI000443_F3B6_4ec0_BF8C_0265A6C826AC" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000444_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_LI000445_9882_4995_AD97_001D3FCBE1D3" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000446_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_LI000447_B548_4f26_BC5E_4EB19B6A021A" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000448_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"/>
+							<generalization xmi:type="uml:Generalization" xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" general="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+							<generalization xmi:type="uml:Generalization" xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+						</packagedElement>
+						<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_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_LI000449_2965_4815_8CDE_FB67C01F11E8" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000450_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_LI000451_4E02_4b32_B06D_1C4F4867E9C9" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000452_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_LI000453_C0BD_4ca6_B28B_7D3AF3196028" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000454_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_LI000455_AED3_4851_B6FA_FC23EED7B627" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000456_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_LI000457_2765_4156_8A2B_76137A9E6CBF" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000458_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_LI000459_654A_46a5_B750_B796AB4BF269" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000460_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_LI000461_CC7B_498f_B8C4_29436D9CC375" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000462_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_LI000463__7EC7_4537_B26B_232F5FB37A9C" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000464__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_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_LI000465_A9D2_43ed_A3E9_06F70F22D65B" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000466_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_LI000467__0415_4ef8_A495_71F8920238AD" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000468__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_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_LI000469_B6B6_412c_AD17_AD3730D5DFBA" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000470_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_LI000471_0EA6_4dca_BE6B_B5F4FE407B6E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000472_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_LI000473_906D_4a85_A700_40F3E3506692" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000474_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_LI000475_5E6C_43b3_ACEB_B3E3DEF42F46" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000476_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_LI000477_BAAD_40d2_B56F_21B5FDF8C067" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000478_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_LI000479_ED53_40e1_806D_C89FF9D2DCC9" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000480_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"/>
+						</packagedElement>
+						<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>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" name="evaluation term">
+						<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_LI000481_8AE0_4caf_815F_BF4568DEDD87" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000482_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_LI000483_5C57_44f2_B2C0_AB86BE0977FB" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000484_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_LI000485_7ED7_4105_B7B4_75A752F71E30" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000486_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_LI000487_A182_4668_9F98_14724C693F16" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000488_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_LI000489_8E15_49c4_87DC_7C39B5F7A598" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000490_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"/>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Class" xmi:id="EAID_0C735489_15DC_40a7_A94E_A9202738B188" name="epo:EvaluationTerm">
+							<generalization xmi:type="uml:Generalization" xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" general="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Class" xmi:id="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" name="epo:SelectionEvaluationTerm">
+							<generalization xmi:type="uml:Generalization" xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" general="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
+						</packagedElement>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" name="epo:ProcurementProcedureInformationProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" name="criterion">
+					<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_LI000491_1F3D_4e84_9D31_63CAC92FD094" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000492_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_LI000493__3F48_4102_8A68_8655E9F9B47E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000494__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>
-					<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_LI000469_06F6_455d_A6BC_F15A85D13C7F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000470_06F6_455d_A6BC_F15A85D13C7F" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
+						<memberEnd xmi:idref="EAID_dstCFCF08_3F48_4102_8A68_8655E9F9B47E"/>
+						<memberEnd xmi:idref="EAID_srcCFCF08_3F48_4102_8A68_8655E9F9B47E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCFCF08_3F48_4102_8A68_8655E9F9B47E" association="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
+							<type xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" supplier="EAID_02014F61_A766_467e_BD3D_7F41689C651B" client="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
+						<memberEnd xmi:idref="EAID_dst5C20FC_D382_4766_9563_4C96020D607C"/>
+						<memberEnd xmi:idref="EAID_src5C20FC_D382_4766_9563_4C96020D607C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5C20FC_D382_4766_9563_4C96020D607C" association="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
+							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+						</ownedEnd>
+					</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_LI000495_4A41_46a9_80E7_74981020527C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000496_4A41_46a9_80E7_74981020527C" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
 						</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_LI000471_A4F5_48a8_A318_AD34638C5BB3" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000472_A4F5_48a8_A318_AD34638C5BB3" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_676D6F18_AE33_4f71_A555_AC99CF3627D6" name="cccev:weight">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000497_AE33_4f71_A555_AC99CF3627D6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000498_AE33_4f71_A555_AC99CF3627D6" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
 						</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_LI000473_5F20_46db_B56A_257BE240D92C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000474_5F20_46db_B56A_257BE240D92C" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4111FA66_AACB_4b42_A23A_1AF9C06417B9" name="cccev:weightingConsiderationDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000499_AACB_4b42_A23A_1AF9C06417B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000500_AACB_4b42_A23A_1AF9C06417B9" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000475__6B94_492e_9116_A734400E6358" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000476__6B94_492e_9116_A734400E6358" value="1"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					</packagedElement>
+					<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_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_LI000501__FE85_48db_829F_004DFE769A97" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000502__FE85_48db_829F_004DFE769A97" 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_LI000477__6BD5_49b4_9900_A82C2C734195" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000478__6BD5_49b4_9900_A82C2C734195" value="1"/>
+						<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_LI000503__4BC2_452d_9B78_BA9B3F1E9FF6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000504__4BC2_452d_9B78_BA9B3F1E9FF6" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstFE12D8_04B5_410b_8362_9A907C438713" name="epo:reinforcesResponse" association="EAID_75FE12D8_04B5_410b_8362_9A907C438713">
+							<type xmi:idref="EAID_CB6F44C9_EE4B_44cf_8CCA_ADF25BA8D171"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000505__04B5_410b_8362_9A907C438713" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000506__04B5_410b_8362_9A907C438713" value="*"/>
+						</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_LI000507__7AAE_4276_AA04_83E4BB664FCB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000508__7AAE_4276_AA04_83E4BB664FCB" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
-						<memberEnd xmi:idref="EAID_dst7715A6_6B94_492e_9116_A734400E6358"/>
-						<memberEnd xmi:idref="EAID_src7715A6_6B94_492e_9116_A734400E6358"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7715A6_6B94_492e_9116_A734400E6358" association="EAID_7B7715A6_6B94_492e_9116_A734400E6358">
-							<type xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97">
+						<memberEnd xmi:idref="EAID_dst64913C_FE85_48db_829F_004DFE769A97"/>
+						<memberEnd xmi:idref="EAID_src64913C_FE85_48db_829F_004DFE769A97"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64913C_FE85_48db_829F_004DFE769A97" association="EAID_1864913C_FE85_48db_829F_004DFE769A97">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
-						<memberEnd xmi:idref="EAID_dstA2D6DE_6BD5_49b4_9900_A82C2C734195"/>
-						<memberEnd xmi:idref="EAID_srcA2D6DE_6BD5_49b4_9900_A82C2C734195"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA2D6DE_6BD5_49b4_9900_A82C2C734195" association="EAID_ABA2D6DE_6BD5_49b4_9900_A82C2C734195">
-							<type xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+						<memberEnd xmi:idref="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6"/>
+						<memberEnd xmi:idref="EAID_src204966_4BC2_452d_9B78_BA9B3F1E9FF6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src204966_4BC2_452d_9B78_BA9B3F1E9FF6" association="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 						</ownedEnd>
 					</packagedElement>
-					<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_LI000479__0DFA_49f4_AB11_165E12CB38A6" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000480__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 xmi:type="uml:Association" xmi:id="EAID_75FE12D8_04B5_410b_8362_9A907C438713">
+						<memberEnd xmi:idref="EAID_dstFE12D8_04B5_410b_8362_9A907C438713"/>
+						<memberEnd xmi:idref="EAID_srcFE12D8_04B5_410b_8362_9A907C438713"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFE12D8_04B5_410b_8362_9A907C438713" association="EAID_75FE12D8_04B5_410b_8362_9A907C438713">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-						<memberEnd xmi:idref="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5"/>
-						<memberEnd xmi:idref="EAID_src460B26_E1D3_4c16_AB2B_CBE8A5D24AC5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" association="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src90AB87_7AAE_4276_AA04_83E4BB664FCB" association="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
+							<type xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 						</ownedEnd>
 					</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_LI000481_BE49_4db1_AA79_96A38D4F56DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000482_BE49_4db1_AA79_96A38D4F56DB" value="1"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_A7C105EE_0251_4249_919A_46302D44059E" supplier="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" client="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+					<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_LI000509_8A97_4bdd_A15E_C716B815CC13" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000510_8A97_4bdd_A15E_C716B815CC13" value="*"/>
 							<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_LI000483_C14D_4de1_BF7F_2C1F3E0C5D6F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000484_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_LI000485_D812_40e9_A95F_3E051ECF3AE8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000486_D812_40e9_A95F_3E051ECF3AE8" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EDACC705_499F_489c_AA49_2F4562A747ED" name="skos:prefLabel">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000511_499F_489c_AA49_2F4562A747ED" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000512_499F_489c_AA49_2F4562A747ED" value="*"/>
 							<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"/>
-					</packagedElement>
-					<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">
+						<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_LI000487__6281_4f14_8017_204CCE05A2CC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000488__6281_4f14_8017_204CCE05A2CC" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000513__AC70_477b_AA0D_15C3CB11CC0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000514__AC70_477b_AA0D_15C3CB11CC0C" 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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src66393B_8067_4f18_9B28_69541B862505" association="EAID_9866393B_8067_4f18_9B28_69541B862505">
-							<type xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C"/>
+					<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: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_LI000489__2D18_479d_95EB_23D106ED6921" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000490__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_LI000491__BE4C_49d2_A743_BAD5FFBD3003" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000492__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_LI000493_DF99_409a_B7EC_1F11AB228F3E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000494_DF99_409a_B7EC_1F11AB228F3E" value="*"/>
+					<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_LI000515_4A31_454e_9AA2_45BD4C3E92E9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000516_4A31_454e_9AA2_45BD4C3E92E9" value="1"/>
 							<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_LI000495_E9F3_442e_8CF7_7CC26E757EE5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000496_E9F3_442e_8CF7_7CC26E757EE5" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_76501C03_8E25_4f73_ACD2_B452220092B4" name="skos:prefLabel">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000517_8E25_4f73_ACD2_B452220092B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000518_8E25_4f73_ACD2_B452220092B4" value="1"/>
 							<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"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" name="epo:QualificationCriterion">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					</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>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" name="epo:RequestForParticipation">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					</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_LI000497_CB77_4e9d_93C3_62DD41ADF53D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000498_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_LI000499__2F48_4952_926C_444F368462AA" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000500__2F48_4952_926C_444F368462AA" value="1"/>
+						<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_LI000519__08F1_4183_A0A9_C1CCAB84A53A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000520__08F1_4183_A0A9_C1CCAB84A53A" 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_LI000501__1403_4dcc_B7C6_33C21269E183" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000502__1403_4dcc_B7C6_33C21269E183" value="1"/>
+						<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_LI000521__AEE0_4ae9_BFBB_56453EA7473F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000522__AEE0_4ae9_BFBB_56453EA7473F" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA">
-						<memberEnd xmi:idref="EAID_dst63763E_2F48_4952_926C_444F368462AA"/>
-						<memberEnd xmi:idref="EAID_src63763E_2F48_4952_926C_444F368462AA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src63763E_2F48_4952_926C_444F368462AA" association="EAID_9663763E_2F48_4952_926C_444F368462AA">
-							<type xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
+					<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: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"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src59B897_AEE0_4ae9_BFBB_56453EA7473F" association="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+							<type xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
 						</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">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613" supplier="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" client="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
-						<memberEnd xmi:idref="EAID_dst531817_E843_4c42_8EA1_111804B30C38"/>
-						<memberEnd xmi:idref="EAID_src531817_E843_4c42_8EA1_111804B30C38"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src531817_E843_4c42_8EA1_111804B30C38" association="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
-							<type xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" name="epo:AwardCriteriaSummary">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" general="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
 					</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_LI000503_4D56_407f_AC7F_3F2241342033" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000504_4D56_407f_AC7F_3F2241342033" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+					<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_LI000523_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000524_25D3_46df_95DD_5B5DE9E1726B" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" general="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_4FD10EB5_5FE5_4f22_A0BA_CF6DF5927076" name="epo:hasFixedValue">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000525_5FE5_4f22_A0BA_CF6DF5927076" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000526_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"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" supplier="EAID_0CC18385_984E_4d4c_A942_07304CE66481" client="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
-						<memberEnd xmi:idref="EAID_dstEB89B4_BF73_4250_B00A_CDF53D99CBCD"/>
-						<memberEnd xmi:idref="EAID_srcEB89B4_BF73_4250_B00A_CDF53D99CBCD"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB89B4_BF73_4250_B00A_CDF53D99CBCD" association="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
-							<type xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19" supplier="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" client="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0" supplier="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" client="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_85A133A7_B643_4be4_BECC_55BA9277D3E5">
+						<memberEnd xmi:idref="EAID_dstA133A7_B643_4be4_BECC_55BA9277D3E5"/>
+						<memberEnd xmi:idref="EAID_srcA133A7_B643_4be4_BECC_55BA9277D3E5"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA133A7_B643_4be4_BECC_55BA9277D3E5" association="EAID_85A133A7_B643_4be4_BECC_55BA9277D3E5">
+							<type xmi:idref="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198"/>
 						</ownedEnd>
 					</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_LI000505_50C9_427a_A35D_6F824C0B5371" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000506_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_LI000507_A663_4c85_A496_E79BDE625A17" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000508_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_LI000509__EDE9_461d_85E1_1ABB6B9E21EB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000510__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 xmi:type="uml:Association" xmi:id="EAID_B5467B84_956A_4b79_8469_069C219DEFD9">
+						<memberEnd xmi:idref="EAID_dst467B84_956A_4b79_8469_069C219DEFD9"/>
+						<memberEnd xmi:idref="EAID_src467B84_956A_4b79_8469_069C219DEFD9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src467B84_956A_4b79_8469_069C219DEFD9" association="EAID_B5467B84_956A_4b79_8469_069C219DEFD9">
+							<type xmi:idref="EAID_640F316F_44B1_44a6_9B37_FD17A852946F"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" name="epo:EconomicStandingSummary">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_35039C01_2836_47b3_898F_14269D31CF88" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-						<memberEnd xmi:idref="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB"/>
-						<memberEnd xmi:idref="EAID_src33CDC7_EDE9_461d_85E1_1ABB6B9E21EB"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" association="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-							<type xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" name="epo:ExclusionGround">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" general="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_5B73AEFB_F659_439b_9785_A42DDD528189">
+						<memberEnd xmi:idref="EAID_dst73AEFB_F659_439b_9785_A42DDD528189"/>
+						<memberEnd xmi:idref="EAID_src73AEFB_F659_439b_9785_A42DDD528189"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src73AEFB_F659_439b_9785_A42DDD528189" association="EAID_5B73AEFB_F659_439b_9785_A42DDD528189">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
-						<memberEnd xmi:idref="EAID_dst34B051_9C2E_444e_83DD_D95F6EA9897B"/>
-						<memberEnd xmi:idref="EAID_src34B051_9C2E_444e_83DD_D95F6EA9897B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src34B051_9C2E_444e_83DD_D95F6EA9897B" association="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CDBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD">
+						<memberEnd xmi:idref="EAID_dstBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD"/>
+						<memberEnd xmi:idref="EAID_srcBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD" association="EAID_CDBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" name="epo:ReviewProcedureInformationProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" name="epo:ExclusionGroundsSummary">
+						<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:Association" xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
-						<memberEnd xmi:idref="EAID_dst9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E"/>
-						<memberEnd xmi:idref="EAID_src9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" association="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
-							<type xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" name="epo:ParticipationCondition">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 					</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_LI000511_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000512_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+					<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_LI000527_F9A9_4ed3_8B7D_8A8A4C4E0014" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000528_F9A9_4ed3_8B7D_8A8A4C4E0014" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000513_D59B_44ce_A5E7_049DA74AA55E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000514_D59B_44ce_A5E7_049DA74AA55E" value="1"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F79D34B1_CCFA_4297_8DDC_3871A35AD86D" name="epo:describesVerificationMethod">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000529_CCFA_4297_8DDC_3871A35AD86D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000530_CCFA_4297_8DDC_3871A35AD86D" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000515_C11F_437d_8F7E_44D4FAF1B79E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000516_C11F_437d_8F7E_44D4FAF1B79E" value="1"/>
-							<type xmi:idref="EAJava_xsd_date"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" general="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_0EC24453_1D32_4b47_B797_31C56125A97E" supplier="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" client="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826"/>
+					<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_LI000531_053A_4b0b_93CE_CA1C3787B4A3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000532_053A_4b0b_93CE_CA1C3787B4A3" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000517_E023_4686_B908_2AA037456757" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000518_E023_4686_B908_2AA037456757" value="1"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" general="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					</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_53D15EA1_B17A_48ea_983D_0A065FE34A6C" name="epo:hasFormula">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000533_B17A_48ea_983D_0A065FE34A6C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000534_B17A_48ea_983D_0A065FE34A6C" 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_LI000519_37CA_4488_BBCA_E16D118CC6D8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000520_37CA_4488_BBCA_E16D118CC6D8" value="1"/>
-							<type xmi:idref="EAJava_xsd_date"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstD502F3_9569_4211_9D5F_B91738202FE7" name="epo-acc:implementsLegislation" association="EAID_24D502F3_9569_4211_9D5F_B91738202FE7">
+							<type xmi:idref="EAID_3A26D4B3_0F2F_4513_90E4_F69631B6BEE6"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000535__9569_4211_9D5F_B91738202FE7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000536__9569_4211_9D5F_B91738202FE7" value="*"/>
 						</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_LI000521__06B8_43e0_AB80_8F686D5C488E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000522__06B8_43e0_AB80_8F686D5C488E" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst7949C8_0635_450e_85A4_AC036D959E8C" name="epo-acc:comprisesQuestion" association="EAID_867949C8_0635_450e_85A4_AC036D959E8C">
+							<type xmi:idref="EAID_5B748559_6ACE_401d_8620_2277FC03CBEF"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000537__0635_450e_85A4_AC036D959E8C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000538__0635_450e_85A4_AC036D959E8C" value="*"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst02C1C9_9374_471a_8C42_F2BF4DE15D1A" name="epo-acc:implementsArticle" association="EAID_8C02C1C9_9374_471a_8C42_F2BF4DE15D1A">
+							<type xmi:idref="EAID_8E88CD3B_9370_40c9_945F_A8FD72FBF8A4"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000539__9374_471a_8C42_F2BF4DE15D1A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000540__9374_471a_8C42_F2BF4DE15D1A" value="*"/>
+						</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_LI000541__D382_4766_9563_4C96020D607C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000542__D382_4766_9563_4C96020D607C" value="*"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24D502F3_9569_4211_9D5F_B91738202FE7">
+						<memberEnd xmi:idref="EAID_dstD502F3_9569_4211_9D5F_B91738202FE7"/>
+						<memberEnd xmi:idref="EAID_srcD502F3_9569_4211_9D5F_B91738202FE7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD502F3_9569_4211_9D5F_B91738202FE7" association="EAID_24D502F3_9569_4211_9D5F_B91738202FE7">
+							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 						</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 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"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" supplier="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" client="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_867949C8_0635_450e_85A4_AC036D959E8C">
+						<memberEnd xmi:idref="EAID_dst7949C8_0635_450e_85A4_AC036D959E8C"/>
+						<memberEnd xmi:idref="EAID_src7949C8_0635_450e_85A4_AC036D959E8C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7949C8_0635_450e_85A4_AC036D959E8C" association="EAID_867949C8_0635_450e_85A4_AC036D959E8C">
+							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+						</ownedEnd>
 					</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_LI000523_8E47_4d04_95BC_AFD636549F08" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000524_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_LI000525__BF73_4250_B00A_CDF53D99CBCD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000526__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_LI000527__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000528__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
-						</ownedAttribute>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_8C02C1C9_9374_471a_8C42_F2BF4DE15D1A">
+						<memberEnd xmi:idref="EAID_dst02C1C9_9374_471a_8C42_F2BF4DE15D1A"/>
+						<memberEnd xmi:idref="EAID_src02C1C9_9374_471a_8C42_F2BF4DE15D1A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src02C1C9_9374_471a_8C42_F2BF4DE15D1A" association="EAID_8C02C1C9_9374_471a_8C42_F2BF4DE15D1A">
+							<type xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
-						<memberEnd xmi:idref="EAID_dstC46ECB_7950_4db1_AA23_2C9AD7E8E999"/>
-						<memberEnd xmi:idref="EAID_srcC46ECB_7950_4db1_AA23_2C9AD7E8E999"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC46ECB_7950_4db1_AA23_2C9AD7E8E999" association="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
-							<type xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+						<memberEnd xmi:idref="EAID_dstCF5F1B_45DD_4b29_9E28_8D741E0840F3"/>
+						<memberEnd xmi:idref="EAID_srcCF5F1B_45DD_4b29_9E28_8D741E0840F3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCF5F1B_45DD_4b29_9E28_8D741E0840F3" association="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 						</ownedEnd>
 					</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_LI000529_9460_4e04_BCD7_38CCB8AFA518" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000530_9460_4e04_BCD7_38CCB8AFA518" value="*"/>
+					<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_LI000543_BE49_4db1_AA79_96A38D4F56DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000544_BE49_4db1_AA79_96A38D4F56DB" value="1"/>
 							<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_LI000531_8210_42d8_9286_649347222247" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000532_8210_42d8_9286_649347222247" value="1"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_85DA2813_C14D_4de1_BF7F_2C1F3E0C5D6F" name="epo:hasServiceReservedToParticularProfession">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000545_C14D_4de1_BF7F_2C1F3E0C5D6F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000546_C14D_4de1_BF7F_2C1F3E0C5D6F" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000533_4513_4003_8F57_CB232AF26678" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000534_4513_4003_8F57_CB232AF26678" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F84EB591_D812_40e9_A95F_3E051ECF3AE8" name="epo:describesProfession">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000547_D812_40e9_A95F_3E051ECF3AE8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000548_D812_40e9_A95F_3E051ECF3AE8" value="1"/>
 							<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_LI000535__E843_4c42_8EA1_111804B30C38" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000536__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_LI000537__3D5F_4ffe_AC22_DE4C7CCE3C2E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000538__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_4A4C0A9C_E865_4a6a_B108_12037190211E" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 					</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_LI000539_CABF_495e_8376_7F059C142FA2" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000540_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_LI000541_3D05_426d_B057_4FE0D785D8C5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000542_3D05_426d_B057_4FE0D785D8C5" value="*"/>
+					<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_LI000549_DF99_409a_B7EC_1F11AB228F3E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000550_DF99_409a_B7EC_1F11AB228F3E" 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_LI000543_1B92_4286_8D4C_A392932D7D7E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000544_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"/>
-					</packagedElement>
-					<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_LI000545__365D_4082_8CC4_DA85F79E7124" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000546__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_LI000547__995F_486e_A7A9_407855E7F1B8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000548__995F_486e_A7A9_407855E7F1B8" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_EB158250_E9F3_442e_8CF7_7CC26E757EE5" name="epo:hasConditionVerificationMethod">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000551_E9F3_442e_8CF7_7CC26E757EE5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000552_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"/>
 					</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 xmi:type="uml:Class" xmi:id="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" name="epo:QualificationCriterion">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" general="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 					</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_LI000549_E5DD_431b_8A44_E0CCD873D80E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000550_E5DD_431b_8A44_E0CCD873D80E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000553_E5DD_431b_8A44_E0CCD873D80E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000554_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_LI000551_3838_4756_A2F0_4B97431AD5FB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000552_3838_4756_A2F0_4B97431AD5FB" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000555_3838_4756_A2F0_4B97431AD5FB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000556_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_LI000553_B119_4b3b_8873_8E1E9D97CE99" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000554_B119_4b3b_8873_8E1E9D97CE99" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000557_B119_4b3b_8873_8E1E9D97CE99" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000558_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"/>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1" supplier="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" client="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122"/>
 					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3" supplier="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2" client="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122"/>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" name="epo:SelectionEvaluationTerm">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" general="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_4EB90EAA_7715_466f_B3EC_07F4892C035E">
+						<memberEnd xmi:idref="EAID_dstB90EAA_7715_466f_B3EC_07F4892C035E"/>
+						<memberEnd xmi:idref="EAID_srcB90EAA_7715_466f_B3EC_07F4892C035E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB90EAA_7715_466f_B3EC_07F4892C035E" association="EAID_4EB90EAA_7715_466f_B3EC_07F4892C035E">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" name="epo:SocialProcurement">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_857D08F9_84F2_4d98_8718_882951247DF8" general="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EA5013BD_1CE9_454b_9F1D_5A805EEFD17D">
+						<memberEnd xmi:idref="EAID_dst5013BD_1CE9_454b_9F1D_5A805EEFD17D"/>
+						<memberEnd xmi:idref="EAID_src5013BD_1CE9_454b_9F1D_5A805EEFD17D"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5013BD_1CE9_454b_9F1D_5A805EEFD17D" association="EAID_EA5013BD_1CE9_454b_9F1D_5A805EEFD17D">
+							<type xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370"/>
+						</ownedEnd>
 					</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_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 xmi:type="uml:Class" xmi:id="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" name="epo:TechnicalAbilitySummary">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 					</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_LI000555_7C22_4de2_97E6_B0EAE94F70B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000556_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_LI000557_B485_4d58_9B75_069462E81184" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000558_B485_4d58_9B75_069462E81184" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					<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_LI000559_AB6F_4533_9B27_84455D46F093" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000560_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"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" supplier="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" client="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
-						<memberEnd xmi:idref="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87"/>
-						<memberEnd xmi:idref="EAID_srcD470D5_433B_4242_826E_974C4A3AEF87"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD470D5_433B_4242_826E_974C4A3AEF87" association="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_B62DE754_3523_45c7_9426_333EF3B4B423" supplier="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" client="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB">
+						<memberEnd xmi:idref="EAID_dstBED690_3A74_4118_8357_6957359310FB"/>
+						<memberEnd xmi:idref="EAID_srcBED690_3A74_4118_8357_6957359310FB"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBED690_3A74_4118_8357_6957359310FB" association="EAID_C3BED690_3A74_4118_8357_6957359310FB">
+							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
 						</ownedEnd>
 					</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_LI000559_07BA_4b02_9D13_99D00FD703DB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000560_07BA_4b02_9D13_99D00FD703DB" value="*"/>
+					<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_LI000561_DA18_4262_A463_6D90A10A85D1" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000562_DA18_4262_A463_6D90A10A85D1" value="1"/>
 							<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_LI000561_C085_4834_BA34_2B1691E8A7F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000562_C085_4834_BA34_2B1691E8A7F4" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_54479CB6_87F3_4910_BFF6_0EAAC1E6F403" name="epo:hasURL">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000563_87F3_4910_BFF6_0EAAC1E6F403" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000564_87F3_4910_BFF6_0EAAC1E6F403" value="1"/>
+							<type xmi:idref="EAJava_xsd_anyURI"/>
 						</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_LI000563_DEA8_4237_9133_432198D98388" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000564_DEA8_4237_9133_432198D98388" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000565__1FBF_4d9c_9A77_C246A6F21E71" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000566__1FBF_4d9c_9A77_C246A6F21E71" value="1"/>
 						</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_LI000565__7874_4515_A52E_6EBA9F23871A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000566__7874_4515_A52E_6EBA9F23871A" value="1"/>
+						<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_LI000567__3A74_4118_8357_6957359310FB" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000568__3A74_4118_8357_6957359310FB" 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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+						<memberEnd xmi:idref="EAID_dst49101F_45CB_45ba_9792_E3508C6FE92A"/>
+						<memberEnd xmi:idref="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src49101F_45CB_45ba_9792_E3508C6FE92A" association="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src98771E_06E0_4141_9CF5_2CFE5FEB856B" association="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" name="ProxyConnector"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" name="ProxyConnector">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" general="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" name="epo:Subcontractor">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" name="strategic procurement">
+					<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_LI000569_E79A_4249_A596_0EDB3DECCE55" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000570_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"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
-						<memberEnd xmi:idref="EAID_dst545C91_D269_4cfe_A646_9A2FDEE01B0F"/>
-						<memberEnd xmi:idref="EAID_src545C91_D269_4cfe_A646_9A2FDEE01B0F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src545C91_D269_4cfe_A646_9A2FDEE01B0F" association="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856" supplier="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" client="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_9E45040E_9573_4ec2_971F_0407E27D9413" supplier="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" client="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
+						<memberEnd xmi:idref="EAID_dstE43E48_CB11_4fae_87F3_C0ACAEAF591C"/>
+						<memberEnd xmi:idref="EAID_srcE43E48_CB11_4fae_87F3_C0ACAEAF591C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE43E48_CB11_4fae_87F3_C0ACAEAF591C" association="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C">
+							<type xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
 						</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_LI000567_B6B6_412c_AD17_AD3730D5DFBA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000568_B6B6_412c_AD17_AD3730D5DFBA" value="*"/>
+					<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>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549" supplier="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" client="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" name="epo:SocialProcurement">
+						<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_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_LI000571_7C22_4de2_97E6_B0EAE94F70B9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000572_7C22_4de2_97E6_B0EAE94F70B9" 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_LI000569_0EA6_4dca_BE6B_B5F4FE407B6E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000570_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_LI000571_906D_4a85_A700_40F3E3506692" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000572_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_LI000573_5E6C_43b3_ACEB_B3E3DEF42F46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000574_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_LI000575_BAAD_40d2_B56F_21B5FDF8C067" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000576_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_LI000577_ED53_40e1_806D_C89FF9D2DCC9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000578_ED53_40e1_806D_C89FF9D2DCC9" value="1"/>
-							<type xmi:idref="EAJava_xsd_decimal"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_98F7F863_B485_4d58_9B75_069462E81184" name="epo:hasStrategicProcurementDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000573_B485_4d58_9B75_069462E81184" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000574_B485_4d58_9B75_069462E81184" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" general="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
 					</packagedElement>
-					<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_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"/>
-							<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_LI000581_4E2E_4945_84FF_A2A3E2C8BCA1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000582_4E2E_4945_84FF_A2A3E2C8BCA1" 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_LI000583_1D3E_4c68_960A_9BF2F3B08B20" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000584_1D3E_4c68_960A_9BF2F3B08B20" 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_LI000585_D2FB_4c1d_A657_3AA99D21F66E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000586_D2FB_4c1d_A657_3AA99D21F66E" 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_LI000587_7E02_46c6_A777_E9E9132A3815" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000588_7E02_46c6_A777_E9E9132A3815" 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_LI000589_3813_42b3_8315_8C6CBF336665" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000590_3813_42b3_8315_8C6CBF336665" 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_LI000591_DD58_4d75_AD92_B5CFC9EE5A10" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000592_DD58_4d75_AD92_B5CFC9EE5A10" 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_LI000593_01EA_49ea_94F2_462142A81086" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000594_01EA_49ea_94F2_462142A81086" 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_LI000595_9B54_4a8c_9166_AB8E17EEEFE1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000596_9B54_4a8c_9166_AB8E17EEEFE1" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_86BBDF9D_8C1C_4984_BD5E_25D9163F6316" name="epo:hasAbnormallyLowTenders">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000597_8C1C_4984_BD5E_25D9163F6316" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000598_8C1C_4984_BD5E_25D9163F6316" value="1"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" supplier="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" client="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+					<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_LI000575_0A29_4594_97B0_16D705A9F927" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000576_0A29_4594_97B0_16D705A9F927" 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_LI000599_CE22_4288_863A_8E8C62DB94DC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000600_CE22_4288_863A_8E8C62DB94DC" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_79CEE53B_719C_42c2_8AE2_8FB4C6159B75" name="epo:hasZeroEmissionVehicles">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000577_719C_42c2_8AE2_8FB4C6159B75" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000578_719C_42c2_8AE2_8FB4C6159B75" 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_LI000601_9340_45d0_85E3_1BE9CC684052" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000602_9340_45d0_85E3_1BE9CC684052" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9437602D_8F8F_47f4_A458_A53DAE08FDF0" name="epo:hasCleanVehicles">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000579_8F8F_47f4_A458_A53DAE08FDF0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000580_8F8F_47f4_A458_A53DAE08FDF0" 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_LI000603_8DD5_4abd_B795_C65BE998ABE7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000604_8DD5_4abd_B795_C65BE998ABE7" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000581__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000582__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
 						</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_LI000605_287D_475d_84A4_F2E5E5193FAD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000606_287D_475d_84A4_F2E5E5193FAD" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+					</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"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" supplier="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" client="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" name="technique">
+					<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>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065" supplier="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" client="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" name="epo:EAuctionTechnique">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" general="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" name="epo:FrameworkAgreementTechnique">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0" general="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					</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_LI000583_AD44_401f_A23C_F48405982480" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000584_AD44_401f_A23C_F48405982480" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000607_066D_4f5d_97D2_96AC42B10531" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000608_066D_4f5d_97D2_96AC42B10531" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000585__B134_4261_8994_841365A27FAB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000586__B134_4261_8994_841365A27FAB" value="1"/>
 						</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_LI000609_E9E1_4296_8A67_2704E861B606" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000610_E9E1_4296_8A67_2704E861B606" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+					</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>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" name="award">
+					<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_LI000587__F377_4405_82EA_14ABA20458B6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000588__F377_4405_82EA_14ABA20458B6" value="1"/>
 						</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_LI000611_A021_49b9_875D_5F7820C48B73" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000612_A021_49b9_875D_5F7820C48B73" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000589__6CF5_410f_83E6_3CAF530D5403" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000590__6CF5_410f_83E6_3CAF530D5403" value="*"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst27E296_9886_44bc_86E7_B4E433F87208" name="epo:hasHighestReceivedTenderValue" association="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+						<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_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_LI000591__BA32_4888_BB1A_167306D6B16C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000592__BA32_4888_BB1A_167306D6B16C" 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"/>
-						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95" name="epo:summarisesInformationForAwardOutcome" association="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
+					</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
+						<memberEnd xmi:idref="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6"/>
+						<memberEnd xmi:idref="EAID_src7A511C_F377_4405_82EA_14ABA20458B6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7A511C_F377_4405_82EA_14ABA20458B6" association="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
 							<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"/>
-						</ownedAttribute>
+						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
+						<memberEnd xmi:idref="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403"/>
+						<memberEnd xmi:idref="EAID_src4C01E9_6CF5_410f_83E6_3CAF530D5403"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4C01E9_6CF5_410f_83E6_3CAF530D5403" association="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
+							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
 						</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">
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" supplier="EAID_D46376EC_6B98_4926_8627_A594E6819D78" client="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
+						<memberEnd xmi:idref="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C"/>
+						<memberEnd xmi:idref="EAID_src57E7B8_BA32_4888_BB1A_167306D6B16C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src57E7B8_BA32_4888_BB1A_167306D6B16C" association="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
+							<type xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
+						<memberEnd xmi:idref="EAID_dst215D61_0282_4111_B11C_CBD651205C58"/>
+						<memberEnd xmi:idref="EAID_src215D61_0282_4111_B11C_CBD651205C58"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src215D61_0282_4111_B11C_CBD651205C58" association="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
+							<type xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
+						<memberEnd xmi:idref="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95"/>
+						<memberEnd xmi:idref="EAID_srcBE64C7_3F6B_4881_AB89_9342AF882E95"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE64C7_3F6B_4881_AB89_9342AF882E95" association="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
 							<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"/>
-							<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"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+					<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_LI000593_2465_4986_9670_843B221BB214" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000594_2465_4986_9670_843B221BB214" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_836F6511_2E62_4d10_8AC1_07C24D6A907F" name="epo:hasNonAwardedContractNumber">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000595_2E62_4d10_8AC1_07C24D6A907F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000596_2E62_4d10_8AC1_07C24D6A907F" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000597__598C_4f96_8D8A_71BD69D25161" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000598__598C_4f96_8D8A_71BD69D25161" value="1"/>
 						</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="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000599__95A4_4f77_A6DC_62DFC84C122D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000600__95A4_4f77_A6DC_62DFC84C122D" value="1"/>
 						</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="*"/>
-							<type xmi:idref="EAJava_xsd_anyURI"/>
+						<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_LI000601__E8C8_4628_94BC_1C90816E0487" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000602__E8C8_4628_94BC_1C90816E0487" value="1"/>
 						</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="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" general="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
+						<memberEnd xmi:idref="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161"/>
+						<memberEnd xmi:idref="EAID_src87247C_598C_4f96_8D8A_71BD69D25161"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src87247C_598C_4f96_8D8A_71BD69D25161" association="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161">
+							<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7619CE_95A4_4f77_A6DC_62DFC84C122D" association="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D">
+							<type xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
+						<memberEnd xmi:idref="EAID_dstBA1AAE_EBFD_419c_8F21_8256FE25DBAC"/>
+						<memberEnd xmi:idref="EAID_srcBA1AAE_EBFD_419c_8F21_8256FE25DBAC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA1AAE_EBFD_419c_8F21_8256FE25DBAC" association="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
+							<type xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
+						<memberEnd xmi:idref="EAID_dst6B5FDE_85B9_4435_B7E7_D176E6996280"/>
+						<memberEnd xmi:idref="EAID_src6B5FDE_85B9_4435_B7E7_D176E6996280"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B5FDE_85B9_4435_B7E7_D176E6996280" association="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280">
+							<type xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
+						</ownedEnd>
+					</packagedElement>
+					<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_LI000603__F987_4c92_B06C_0EA23C9FD1C7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000604__F987_4c92_B06C_0EA23C9FD1C7" value="1"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<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_LI000605__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000606__C6FC_4a8d_93CA_CC7ACC63568D" value="1"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
+						<memberEnd xmi:idref="EAID_dstB7EE24_F987_4c92_B06C_0EA23C9FD1C7"/>
+						<memberEnd xmi:idref="EAID_srcB7EE24_F987_4c92_B06C_0EA23C9FD1C7"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB7EE24_F987_4c92_B06C_0EA23C9FD1C7" association="EAID_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7">
+							<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7EDA02_3460_4960_8D22_F25373156526" association="EAID_0A7EDA02_3460_4960_8D22_F25373156526">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+						<memberEnd xmi:idref="EAID_dst6B2F1A_EF51_458e_A7C0_67100DC0E58E"/>
+						<memberEnd xmi:idref="EAID_src6B2F1A_EF51_458e_A7C0_67100DC0E58E"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6B2F1A_EF51_458e_A7C0_67100DC0E58E" association="EAID_9C6B2F1A_EF51_458e_A7C0_67100DC0E58E">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
+						<memberEnd xmi:idref="EAID_dstEB9836_FFEC_4652_9501_AB53057BAF53"/>
+						<memberEnd xmi:idref="EAID_srcEB9836_FFEC_4652_9501_AB53057BAF53"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB9836_FFEC_4652_9501_AB53057BAF53" association="EAID_B6EB9836_FFEC_4652_9501_AB53057BAF53">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+						<memberEnd xmi:idref="EAID_dst76DFA8_9FC1_4db0_86FF_2CE55FF62AB6"/>
+						<memberEnd xmi:idref="EAID_src76DFA8_9FC1_4db0_86FF_2CE55FF62AB6"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" association="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+						</ownedEnd>
+					</packagedElement>
+					<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_LI000607__7ED0_457c_8310_43761AC8295C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000608__7ED0_457c_8310_43761AC8295C" value="1"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" general="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
+						<memberEnd xmi:idref="EAID_dstF2D4DC_7ED0_457c_8310_43761AC8295C"/>
+						<memberEnd xmi:idref="EAID_srcF2D4DC_7ED0_457c_8310_43761AC8295C"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF2D4DC_7ED0_457c_8310_43761AC8295C" association="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
+							<type xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
+						<memberEnd xmi:idref="EAID_dst75C037_BE4C_49d2_A743_BAD5FFBD3003"/>
+						<memberEnd xmi:idref="EAID_src75C037_BE4C_49d2_A743_BAD5FFBD3003"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src75C037_BE4C_49d2_A743_BAD5FFBD3003" association="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003">
+							<type xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8"/>
+						</ownedEnd>
+					</packagedElement>
+					<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_LI000609__4324_4eba_B071_A8B833BDA1EF" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000610__4324_4eba_B071_A8B833BDA1EF" value="1"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_boolean"/>
+						<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_LI000611__EA38_4786_82CF_5486AAD496C1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000612__EA38_4786_82CF_5486AAD496C1" value="1"/>
 						</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"/>
-							<type xmi:idref="EAJava_xsd_dateTime"/>
+						<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_LI000613__DB12_48df_92AE_A27F7DFCCAC3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000614__DB12_48df_92AE_A27F7DFCCAC3" value="1"/>
 						</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="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<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_LI000615__30DE_429b_AE68_D4CA3CC6E260" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000616__30DE_429b_AE68_D4CA3CC6E260" 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_LI000645__F53F_431c_AED5_36E1786ED85F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000646__F53F_431c_AED5_36E1786ED85F" value="1"/>
+						<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_LI000617__9DFC_48b4_A935_786F35AF2AFB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000618__9DFC_48b4_A935_786F35AF2AFB" 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_LI000647__1A4E_400c_88ED_7EFEB868C4EC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000648__1A4E_400c_88ED_7EFEB868C4EC" value="1"/>
+						<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_LI000619__0159_4fe1_8469_562A93DEF12E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000620__0159_4fe1_8469_562A93DEF12E" 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_LI000649__2E5B_4fa1_B0EA_CB49790C2AAD" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000650__2E5B_4fa1_B0EA_CB49790C2AAD" value="1"/>
+						<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_LI000621__0827_4589_A374_A1CFC018D076" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000622__0827_4589_A374_A1CFC018D076" value="1"/>
 						</ownedAttribute>
 					</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"/>
-						<memberEnd xmi:idref="EAID_srcC31FFB_F53F_431c_AED5_36E1786ED85F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC31FFB_F53F_431c_AED5_36E1786ED85F" association="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
-							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+					<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:Dependency" xmi:id="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E" supplier="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8CA66645_D223_487b_B348_21446E4664A6" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" supplier="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" client="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
-						<memberEnd xmi:idref="EAID_dst7F270C_1A4E_400c_88ED_7EFEB868C4EC"/>
-						<memberEnd xmi:idref="EAID_src7F270C_1A4E_400c_88ED_7EFEB868C4EC"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src7F270C_1A4E_400c_88ED_7EFEB868C4EC" association="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
-							<type xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF70CB6_EA38_4786_82CF_5486AAD496C1" association="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
 						</ownedEnd>
 					</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"/>
+					<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: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_LI000651_5C0F_4b3c_8D5E_F1C29EFEBB48" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000652_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_LI000653__D8E3_4eda_9351_165A2D6D972E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000654__D8E3_4eda_9351_165A2D6D972E" value="1"/>
-						</ownedAttribute>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src564C5C_30DE_429b_AE68_D4CA3CC6E260" association="EAID_59564C5C_30DE_429b_AE68_D4CA3CC6E260">
+							<type xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E">
-						<memberEnd xmi:idref="EAID_dstF47D81_D8E3_4eda_9351_165A2D6D972E"/>
-						<memberEnd xmi:idref="EAID_srcF47D81_D8E3_4eda_9351_165A2D6D972E"/>
+					<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:Class" xmi:id="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" name="epo:TaxInformationProvider">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" general="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<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:Class" xmi:id="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" name="epo:TechnicalAbilitySummary">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C" general="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
+					<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: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_LI000655_AD44_401f_A23C_F48405982480" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000656_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_LI000657__B134_4261_8994_841365A27FAB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000658__B134_4261_8994_841365A27FAB" value="1"/>
-						</ownedAttribute>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src074F10_F8BD_4e56_929F_478C3A0B8424" association="EAID_76074F10_F8BD_4e56_929F_478C3A0B8424">
+							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+						</ownedEnd>
 					</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+						<memberEnd xmi:idref="EAID_dst96E83D_792B_44cd_BDF4_F589B6CAC7A1"/>
+						<memberEnd xmi:idref="EAID_src96E83D_792B_44cd_BDF4_F589B6CAC7A1"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src96E83D_792B_44cd_BDF4_F589B6CAC7A1" association="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1">
+							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
 						</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" association="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
-							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+						<memberEnd xmi:idref="EAID_dstBA098A_C04A_4c7d_A8BE_2A965642DCD3"/>
+						<memberEnd xmi:idref="EAID_srcBA098A_C04A_4c7d_A8BE_2A965642DCD3"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBA098A_C04A_4c7d_A8BE_2A965642DCD3" association="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3">
+							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
-						<memberEnd xmi:idref="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7"/>
-						<memberEnd xmi:idref="EAID_srcE68ED4_8A73_411c_B751_1F0998CC86A7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE68ED4_8A73_411c_B751_1F0998CC86A7" association="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
+						<memberEnd xmi:idref="EAID_dst53A3B1_64BB_454a_8FCF_CE8415CE3F22"/>
+						<memberEnd xmi:idref="EAID_src53A3B1_64BB_454a_8FCF_CE8415CE3F22"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src53A3B1_64BB_454a_8FCF_CE8415CE3F22" association="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22">
+							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+						</ownedEnd>
+					</packagedElement>
+					<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_LI000623__365D_4082_8CC4_DA85F79E7124" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000624__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_LI000625__995F_486e_A7A9_407855E7F1B8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000626__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_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_LI000659_7BA5_4caf_9BBC_1CFC01B63943" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000660_7BA5_4caf_9BBC_1CFC01B63943" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000627_7BA5_4caf_9BBC_1CFC01B63943" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000628_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_LI000661__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000662__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000629__92E0_435e_9C45_B9A2F9CBFE43" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000630__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_LI000663__FABC_4b24_A3E6_B0420EB7CF2A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000664__FABC_4b24_A3E6_B0420EB7CF2A" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000631__FABC_4b24_A3E6_B0420EB7CF2A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000632__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>
@@ -3600,327 +3606,602 @@
 							<type xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-						<memberEnd xmi:idref="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A"/>
-						<memberEnd xmi:idref="EAID_srcED3FAD_FABC_4b24_A3E6_B0420EB7CF2A"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" association="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-							<type xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
-						</ownedEnd>
+					<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_BB22A753_783A_4d79_B795_B4D7DEE0BA53" name="epo:Tenderer">
-						<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_LI000665__B9E8_4e17_87D7_D2C5E8C7FFF8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000666__B9E8_4e17_87D7_D2C5E8C7FFF8" value="1"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" name="contextual description">
+					<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_LI000633_8B8C_4be7_9E3D_A338B0A518EE" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000634_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_LI000635__77C6_4480_A13E_A5E9A66D9379" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000636__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_LI000637__424C_4f36_8E1E_BF993F4D765A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000638__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_LI000639__0633_482d_BA4A_4553057B7C23" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000640__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>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
-						<memberEnd xmi:idref="EAID_dst636EE3_DE81_4083_BF9B_6F607A63A921"/>
-						<memberEnd xmi:idref="EAID_src636EE3_DE81_4083_BF9B_6F607A63A921"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src636EE3_DE81_4083_BF9B_6F607A63A921" association="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921">
-							<type xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
+						<memberEnd xmi:idref="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379"/>
+						<memberEnd xmi:idref="EAID_srcA6C38F_77C6_4480_A13E_A5E9A66D9379"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA6C38F_77C6_4480_A13E_A5E9A66D9379" association="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
+							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
-						<memberEnd xmi:idref="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46"/>
-						<memberEnd xmi:idref="EAID_src26EBD4_4329_4e57_9F78_AF7887C44E46"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src26EBD4_4329_4e57_9F78_AF7887C44E46" association="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
+						<memberEnd xmi:idref="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A"/>
+						<memberEnd xmi:idref="EAID_srcD18452_424C_4f36_8E1E_BF993F4D765A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD18452_424C_4f36_8E1E_BF993F4D765A" association="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
+							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" name="epo:TenderProcessor">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" name="epo:TenderReceiver">
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" general="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
+						<memberEnd xmi:idref="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23"/>
+						<memberEnd xmi:idref="EAID_src5EEDCE_0633_482d_BA4A_4553057B7C23"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EEDCE_0633_482d_BA4A_4553057B7C23" association="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
+							<type xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Class" xmi:id="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" name="epo:Term"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-						<memberEnd xmi:idref="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378"/>
-						<memberEnd xmi:idref="EAID_src8697AF_821C_40da_B5DE_D7ED82169378"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8697AF_821C_40da_B5DE_D7ED82169378" association="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
+						<memberEnd xmi:idref="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85"/>
+						<memberEnd xmi:idref="EAID_srcC8CD49_71D8_4ef9_919E_87DD36154F85"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC8CD49_71D8_4ef9_919E_87DD36154F85" association="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</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_LI000667_0A29_4594_97B0_16D705A9F927" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000668_0A29_4594_97B0_16D705A9F927" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" name="epo:ContextDescription"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" name="epo:ContextualProjection"/>
+					<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_LI000641_605C_457b_A377_9332E2AA545D" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000642_605C_457b_A377_9332E2AA545D" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000669_719C_42c2_8AE2_8FB4C6159B75" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000670_719C_42c2_8AE2_8FB4C6159B75" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000643__E478_4159_8F53_7F49CAD18053" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000644__E478_4159_8F53_7F49CAD18053" value="1"/>
 						</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_LI000671_8F8F_47f4_A458_A53DAE08FDF0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000672_8F8F_47f4_A458_A53DAE08FDF0" value="1"/>
-							<type xmi:idref="EAJava_xsd_integer"/>
+						<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_LI000645__3E6C_424a_AACD_8319D1389BB9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000646__3E6C_424a_AACD_8319D1389BB9" value="1"/>
 						</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_LI000673__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000674__CB11_4fae_87F3_C0ACAEAF591C" value="1"/>
+						<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_LI000647__1395_4587_9F41_FE45FA8A0605" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000648__1395_4587_9F41_FE45FA8A0605" 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"/>
-					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" supplier="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" client="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0"/>
-					<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_LI000675__DE81_4083_BF9B_6F607A63A921" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000676__DE81_4083_BF9B_6F607A63A921" value="1"/>
+						<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_LI000649__EF0B_4bd7_8D4A_95B9DD217458" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000650__EF0B_4bd7_8D4A_95B9DD217458" value="1"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" general="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 					</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_LI000677_7FDD_4e84_BE6E_9839EB3B7763" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000678_7FDD_4e84_BE6E_9839EB3B7763" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
+						<memberEnd xmi:idref="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053"/>
+						<memberEnd xmi:idref="EAID_srcDE37BE_E478_4159_8F53_7F49CAD18053"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDE37BE_E478_4159_8F53_7F49CAD18053" association="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
+							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
+						<memberEnd xmi:idref="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9"/>
+						<memberEnd xmi:idref="EAID_src84019D_3E6C_424a_AACD_8319D1389BB9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src84019D_3E6C_424a_AACD_8319D1389BB9" association="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
+							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
+						<memberEnd xmi:idref="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458"/>
+						<memberEnd xmi:idref="EAID_src377F2A_EF0B_4bd7_8D4A_95B9DD217458"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src377F2A_EF0B_4bd7_8D4A_95B9DD217458" association="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
+							<type xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" name="epo:Estimate">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" general="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					</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_LI000651_06F6_455d_A6BC_F15A85D13C7F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000652_06F6_455d_A6BC_F15A85D13C7F" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000679_545D_40e6_BC72_AB7858D869B1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000680_545D_40e6_BC72_AB7858D869B1" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2CF0641F_A4F5_48a8_A318_AD34638C5BB3" name="epo:isCompetitionTerminated">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000653_A4F5_48a8_A318_AD34638C5BB3" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000654_A4F5_48a8_A318_AD34638C5BB3" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000681__6066_4ba7_B084_12D7110FE9E0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000682__6066_4ba7_B084_12D7110FE9E0" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_7BE6C389_5F20_46db_B56A_257BE240D92C" name="epo:isDPSTerminated">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000655_5F20_46db_B56A_257BE240D92C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000656_5F20_46db_B56A_257BE240D92C" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000683__D8E3_4eda_9351_165A2D6D972E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000684__D8E3_4eda_9351_165A2D6D972E" value="*"/>
+						<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_LI000657__6B94_492e_9116_A734400E6358" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000658__6B94_492e_9116_A734400E6358" value="1"/>
 						</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_LI000685__4B2A_411b_B5EB_19C2D921F4D1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000686__4B2A_411b_B5EB_19C2D921F4D1" value="*"/>
+						<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_LI000659__6BD5_49b4_9900_A82C2C734195" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000660__6BD5_49b4_9900_A82C2C734195" value="1"/>
 						</ownedAttribute>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
-						<memberEnd xmi:idref="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
-						<memberEnd xmi:idref="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8900B2_4B2A_411b_B5EB_19C2D921F4D1" association="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
-							<type xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-						</ownedEnd>
+					<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_LI000661_4D56_407f_AC7F_3F2241342033" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000662_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"/>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-						<memberEnd xmi:idref="EAID_dst693B40_13CE_47d1_A051_E627959E09EF"/>
-						<memberEnd xmi:idref="EAID_src693B40_13CE_47d1_A051_E627959E09EF"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src693B40_13CE_47d1_A051_E627959E09EF" association="EAID_3F693B40_13CE_47d1_A051_E627959E09EF">
-							<type xmi:idref="EAID_9099AF4F_0019_4768_B85A_99820F3E6307"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" supplier="EAID_0CC18385_984E_4d4c_A942_07304CE66481" client="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
+						<memberEnd xmi:idref="EAID_dstEB89B4_BF73_4250_B00A_CDF53D99CBCD"/>
+						<memberEnd xmi:idref="EAID_srcEB89B4_BF73_4250_B00A_CDF53D99CBCD"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB89B4_BF73_4250_B00A_CDF53D99CBCD" association="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
+							<type xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500"/>
 						</ownedEnd>
 					</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_LI000687_9666_44c8_AE46_FDF98BE48098" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000688_9666_44c8_AE46_FDF98BE48098" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000689_5ACA_48be_9C44_DEB260EE3AB7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000690_5ACA_48be_9C44_DEB260EE3AB7" value="1"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000691_00B9_4f66_9D4B_3409713C111D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000692_00B9_4f66_9D4B_3409713C111D" value="1"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
+					<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_LI000663_8E47_4d04_95BC_AFD636549F08" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000664_8E47_4d04_95BC_AFD636549F08" value="1"/>
+							<type xmi:idref="EAJava_xsd_integer"/>
 						</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_LI000693_073D_455b_A0F6_DB8FE24D4365" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000694_073D_455b_A0F6_DB8FE24D4365" value="1"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
+						<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_LI000665__BF73_4250_B00A_CDF53D99CBCD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000666__BF73_4250_B00A_CDF53D99CBCD" value="*"/>
 						</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_LI000695_0FDA_4c48_8F2E_DB19DABE380D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000696_0FDA_4c48_8F2E_DB19DABE380D" value="1"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
+						<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_LI000667__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000668__7950_4db1_AA23_2C9AD7E8E999" value="1"/>
 						</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_LI000697_DECA_4349_A6FE_21031DBF9E64" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000698_DECA_4349_A6FE_21031DBF9E64" value="1"/>
+					</packagedElement>
+					<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_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_LI000669_07BA_4b02_9D13_99D00FD703DB" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000670_07BA_4b02_9D13_99D00FD703DB" value="*"/>
 							<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_LI000699_515F_4e62_A7A2_8994B97F40FC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000700_515F_4e62_A7A2_8994B97F40FC" value="1"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_961CE08A_C085_4834_BA34_2B1691E8A7F4" name="epo:hasEstimatedPercentage">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000671_C085_4834_BA34_2B1691E8A7F4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000672_C085_4834_BA34_2B1691E8A7F4" value="1"/>
+							<type xmi:idref="EAJava_xsd_decimal"/>
 						</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_LI000701_42EA_469b_B74A_6F71FE025E9D" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000702_42EA_469b_B74A_6F71FE025E9D" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_467A3DAE_DEA8_4237_9133_432198D98388" name="epo:hasSubjectMatter">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000673_DEA8_4237_9133_432198D98388" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000674_DEA8_4237_9133_432198D98388" value="*"/>
 							<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_LI000703_ACFF_41ba_AA83_669E38B9DCC0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000704_ACFF_41ba_AA83_669E38B9DCC0" value="*"/>
-							<type xmi:idref="EAJava_rdf_langString"/>
-						</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_LI000705__11BF_430e_ABED_4C9AC22FFF2A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000706__11BF_430e_ABED_4C9AC22FFF2A" value="1"/>
+						<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_LI000675__7874_4515_A52E_6EBA9F23871A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000676__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: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"/>
+					<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: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_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
-						<memberEnd xmi:idref="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9"/>
-						<memberEnd xmi:idref="EAID_src50E4FC_E8DA_47c5_AD39_5BA2A66950B9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src50E4FC_E8DA_47c5_AD39_5BA2A66950B9" association="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src98771E_06E0_4141_9CF5_2CFE5FEB856B" association="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
-						<memberEnd xmi:idref="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501"/>
-						<memberEnd xmi:idref="EAID_src23612C_1865_4c8b_82ED_0BAA7D433501"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src23612C_1865_4c8b_82ED_0BAA7D433501" association="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" name="epo:SubmissionStatisticalInformation">
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D5E6C297_9C46_4da7_B1B5_F589C83EA61F" name="epo:hasEEAReceivedTenders">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000677_9C46_4da7_B1B5_F589C83EA61F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000678_9C46_4da7_B1B5_F589C83EA61F" 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_LI000679_4E2E_4945_84FF_A2A3E2C8BCA1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000680_4E2E_4945_84FF_A2A3E2C8BCA1" 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_LI000681_1D3E_4c68_960A_9BF2F3B08B20" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000682_1D3E_4c68_960A_9BF2F3B08B20" 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_LI000683_D2FB_4c1d_A657_3AA99D21F66E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000684_D2FB_4c1d_A657_3AA99D21F66E" 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_LI000685_7E02_46c6_A777_E9E9132A3815" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000686_7E02_46c6_A777_E9E9132A3815" 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_LI000687_3813_42b3_8315_8C6CBF336665" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000688_3813_42b3_8315_8C6CBF336665" 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_LI000689_DD58_4d75_AD92_B5CFC9EE5A10" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000690_DD58_4d75_AD92_B5CFC9EE5A10" 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_LI000691_01EA_49ea_94F2_462142A81086" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000692_01EA_49ea_94F2_462142A81086" 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_LI000693_9B54_4a8c_9166_AB8E17EEEFE1" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000694_9B54_4a8c_9166_AB8E17EEEFE1" value="1"/>
+							<type xmi:idref="EAJava_xsd_integer"/>
+						</ownedAttribute>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_86BBDF9D_8C1C_4984_BD5E_25D9163F6316" name="epo:hasAbnormallyLowTenders">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000695_8C1C_4984_BD5E_25D9163F6316" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000696_8C1C_4984_BD5E_25D9163F6316" 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_LI000697_CE22_4288_863A_8E8C62DB94DC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000698_CE22_4288_863A_8E8C62DB94DC" 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_LI000699_9340_45d0_85E3_1BE9CC684052" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000700_9340_45d0_85E3_1BE9CC684052" 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_LI000701_8DD5_4abd_B795_C65BE998ABE7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000702_8DD5_4abd_B795_C65BE998ABE7" 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_LI000703_287D_475d_84A4_F2E5E5193FAD" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000704_287D_475d_84A4_F2E5E5193FAD" 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_LI000705_066D_4f5d_97D2_96AC42B10531" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000706_066D_4f5d_97D2_96AC42B10531" 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_LI000707_E9E1_4296_8A67_2704E861B606" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000708_E9E1_4296_8A67_2704E861B606" 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_LI000709_A021_49b9_875D_5F7820C48B73" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000710_A021_49b9_875D_5F7820C48B73" 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_LI000711__9886_44bc_86E7_B4E433F87208" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000712__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_LI000713__9622_4217_94D7_26E6E451AF0C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000714__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_LI000715__3F6B_4881_AB89_9342AF882E95" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000716__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: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_LI000707_D357_4390_80F0_715754917A04" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000708_D357_4390_80F0_715754917A04" value="*"/>
+					<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>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" name="document">
+					<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_LI000717_01DA_4da5_8782_30A2D193D4B4" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000718_01DA_4da5_8782_30A2D193D4B4" value="1"/>
 							<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_LI000709_1214_4337_9DD2_EE0515B85B64" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000710_1214_4337_9DD2_EE0515B85B64" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_51725CA6_C5F4_4f21_9EF1_1A912A3B0BB5" name="epo:hasPublicationDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000719_C5F4_4f21_9EF1_1A912A3B0BB5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000720_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_LI000721_CD7A_4066_8A4A_E58D6D3A45F9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000722_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_LI000723_E919_4ed9_8E59_56E7A1D1DF02" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000724_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_LI000725_7361_4b50_A424_99670D546E07" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000726_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_LI000727_3387_4afc_904E_98634DCB59F5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000728_3387_4afc_904E_98634DCB59F5" value="1"/>
 							<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_LI000711_BF7B_41b5_91EC_CB0218B68ABA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000712_BF7B_41b5_91EC_CB0218B68ABA" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F6220AE8_8F3D_4028_9A5B_A927863C6D72" name="epo:hasAccessURL">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000729_8F3D_4028_9A5B_A927863C6D72" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000730_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_LI000731_992B_4a90_B977_87F24DE80620" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000732_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_LI000733__19C6_4908_B93C_EED975A6974F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000734__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_LI000735__0D40_4e9f_8018_10297955785C" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000736__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_LI000737__532C_460c_99CE_63F041A42F06" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000738__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_LI000739__DD67_4f31_B72E_BC6C99FF3009" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000740__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_LI000741__8A0D_4eae_BCF0_75001B7FF4D0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000742__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_LI000743__45B0_449d_B8FF_34E21440DAD9" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000744__45B0_449d_B8FF_34E21440DAD9" value="*"/>
+						</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_LI000713_F4BC_41d4_AC3D_ED76B4DB6031" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000714_F4BC_41d4_AC3D_ED76B4DB6031" value="*"/>
+					<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"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF3583F_0D40_4e9f_8018_10297955785C" association="EAID_39F3583F_0D40_4e9f_8018_10297955785C">
+							<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"/>
+						<memberEnd xmi:idref="EAID_srcE6AD20_DD67_4f31_B72E_BC6C99FF3009"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE6AD20_DD67_4f31_B72E_BC6C99FF3009" association="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" supplier="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" client="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
+						<memberEnd xmi:idref="EAID_dst894735_8A0D_4eae_BCF0_75001B7FF4D0"/>
+						<memberEnd xmi:idref="EAID_src894735_8A0D_4eae_BCF0_75001B7FF4D0"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src894735_8A0D_4eae_BCF0_75001B7FF4D0" association="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
+							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+						<memberEnd xmi:idref="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9"/>
+						<memberEnd xmi:idref="EAID_srcE11A54_45B0_449d_B8FF_34E21440DAD9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE11A54_45B0_449d_B8FF_34E21440DAD9" association="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+							<type xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+						<memberEnd xmi:idref="EAID_dstCADBEA_BE8C_41f0_8070_7102E73439C9"/>
+						<memberEnd xmi:idref="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCADBEA_BE8C_41f0_8070_7102E73439C9" association="EAID_F7CADBEA_BE8C_41f0_8070_7102E73439C9">
+							<type xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754"/>
+						</ownedEnd>
+					</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_LI000745_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000746_CB40_4af8_BF5C_1CBDD82A3E31" value="1"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_F9D92C82_287B_4f3e_B5F8_58A2BD4FE9E1" name="epo:hasOrganisationUnitName">
-							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000715_287B_4f3e_B5F8_58A2BD4FE9E1" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000716_287B_4f3e_B5F8_58A2BD4FE9E1" value="1"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" name="epo:ExpressionOfInterest">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<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_LI000747_C67E_4009_888E_552A62DE7225" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000748_C67E_4009_888E_552A62DE7225" value="1"/>
+							<type xmi:idref="EAJava_xsd_integer"/>
 						</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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_2BBC248F_0AEE_4e3f_B002_536AFCD78D28" name="epo:hasOJSType">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000749_0AEE_4e3f_B002_536AFCD78D28" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000750_0AEE_4e3f_B002_536AFCD78D28" 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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_AC36AFF2_4288_4e0c_8944_0179AA352784" name="epo:hasNoticePublicationNumber">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000751_4288_4e0c_8944_0179AA352784" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000752_4288_4e0c_8944_0179AA352784" 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"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_41B830AF_AE4D_4902_8134_A119102AB4ED" name="epo:hasFormNumber">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000753_AE4D_4902_8134_A119102AB4ED" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000754_AE4D_4902_8134_A119102AB4ED" 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="*"/>
-							<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="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_D6C37FAA_411E_4ea1_9106_C6437D14FC89" name="epo:hasEFormsSubtype">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000755_411E_4ea1_9106_C6437D14FC89" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000756_411E_4ea1_9106_C6437D14FC89" value="1"/>
+							<type xmi:idref="EAJava_xsd_integer"/>
 						</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_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_LI000727__E8DA_47c5_AD39_5BA2A66950B9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000728__E8DA_47c5_AD39_5BA2A66950B9" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3F661AC2_73BE_4fb2_9DEF_E733091C3271" name="epo:hasAdditionalInformation">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000757_73BE_4fb2_9DEF_E733091C3271" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000758_73BE_4fb2_9DEF_E733091C3271" value="1"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
-						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501" name="cv: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_LI000729__1865_4c8b_82ED_0BAA7D433501" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000730__1865_4c8b_82ED_0BAA7D433501" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_9517771D_AF11_41cd_BB0D_294796B07624" name="epo:hasESenderDispatchDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000759_AF11_41cd_BB0D_294796B07624" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000760_AF11_41cd_BB0D_294796B07624" value="1"/>
+							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</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_LI000731__10C8_422c_82F3_D4CC50B411F4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000732__10C8_422c_82F3_D4CC50B411F4" value="*"/>
+						<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_LI000761__8D66_48ab_B3C3_6654ABB348DF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000762__8D66_48ab_B3C3_6654ABB348DF" value="*"/>
 						</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_LI000733__A51F_434f_9F2B_CD75C658FF42" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000734__A51F_434f_9F2B_CD75C658FF42" value="*"/>
+						<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_LI000763__F57C_4861_BE52_91F3F7270840" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000764__F57C_4861_BE52_91F3F7270840" value="1"/>
 						</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_LI000735__F52F_4373_8164_044CE03A05CB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000736__F52F_4373_8164_044CE03A05CB" value="*"/>
+						<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_LI000765__651A_4a8b_A411_E8DA312BC449" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000766__651A_4a8b_A411_E8DA312BC449" value="1"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" supplier="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" supplier="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+						<memberEnd xmi:idref="EAID_dstE70932_F57C_4861_BE52_91F3F7270840"/>
+						<memberEnd xmi:idref="EAID_srcE70932_F57C_4861_BE52_91F3F7270840"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE70932_F57C_4861_BE52_91F3F7270840" association="EAID_7EE70932_F57C_4861_BE52_91F3F7270840">
+							<type xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 						</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_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
-						<memberEnd xmi:idref="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
-						<memberEnd xmi:idref="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1BEE04_A51F_434f_9F2B_CD75C658FF42" association="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
-							<type xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<packagedElement xmi:type="uml:Dependency" xmi:id="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" supplier="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" client="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
+						<memberEnd xmi:idref="EAID_dstEA813D_50A9_4b54_8B7C_0A19B505F52F"/>
+						<memberEnd xmi:idref="EAID_srcEA813D_50A9_4b54_8B7C_0A19B505F52F"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEA813D_50A9_4b54_8B7C_0A19B505F52F" association="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
+							<type xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96"/>
 						</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"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
+						<memberEnd xmi:idref="EAID_dst3AE348_60D1_44cb_BC5F_08B65291C2AC"/>
+						<memberEnd xmi:idref="EAID_src3AE348_60D1_44cb_BC5F_08B65291C2AC"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3AE348_60D1_44cb_BC5F_08B65291C2AC" association="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
+							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
+						<memberEnd xmi:idref="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97"/>
+						<memberEnd xmi:idref="EAID_src14464A_EF1A_4230_BB7E_A40906D6ED97"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14464A_EF1A_4230_BB7E_A40906D6ED97" association="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
+							<type xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+						<memberEnd xmi:idref="EAID_dstDD6F7E_CC4D_4861_963A_7FE0F57DA5D8"/>
+						<memberEnd xmi:idref="EAID_srcDD6F7E_CC4D_4861_963A_7FE0F57DA5D8"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDD6F7E_CC4D_4861_963A_7FE0F57DA5D8" association="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8">
+							<type xmi:idref="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB"/>
 						</ownedEnd>
 					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" name="epo:Offer">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" name="epo:OriginatorRequest">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+						<memberEnd xmi:idref="EAID_dst6D38A5_94EF_4bae_941E_311C9FC4668A"/>
+						<memberEnd xmi:idref="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6D38A5_94EF_4bae_941E_311C9FC4668A" association="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A">
+							<type xmi:idref="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809"/>
+						</ownedEnd>
+					</packagedElement>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" name="epo:ProcurementDocument">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</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>
+					<packagedElement xmi:type="uml:Class" xmi:id="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" name="epo:RequestForParticipation">
+						<generalization xmi:type="uml:Generalization" xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" general="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					</packagedElement>
 					<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_LI000737_CC31_4937_8CD8_3FFE6692677E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000738_CC31_4937_8CD8_3FFE6692677E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000767_CC31_4937_8CD8_3FFE6692677E" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000768_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_LI000739_56E5_4540_9E6C_9ECA9C74AD61" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000740_56E5_4540_9E6C_9ECA9C74AD61" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000769_56E5_4540_9E6C_9ECA9C74AD61" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000770_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_LI000741__0282_4111_B11C_CBD651205C58" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000742__0282_4111_B11C_CBD651205C58" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000771__0282_4111_B11C_CBD651205C58" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000772__0282_4111_B11C_CBD651205C58" value="*"/>
 						</ownedAttribute>
 					</packagedElement>
 					<packagedElement xmi:type="uml:Association" xmi:id="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4">
@@ -3951,608 +4232,568 @@
 							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
 						</ownedEnd>
 					</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_LI000743_9DD2_4e8d_A789_27EB4A9F5270" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000744_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_LI000745_6B76_4724_850E_FD4E9D1A9A36" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000746_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_LI000747_F9F3_4dbf_B86E_3117B7D59284" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000748_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_LI000749_6E17_4cc0_9D4D_F2B3BD7DDB82" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000750_6E17_4cc0_9D4D_F2B3BD7DDB82" value="1"/>
+					<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_LI000773_4C0A_478a_ABA1_C730072CAB97" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000774_4C0A_478a_ABA1_C730072CAB97" 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_LI000751_7036_4dff_887C_4784F26EE895" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000752_7036_4dff_887C_4784F26EE895" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_089130B8_3D63_4690_82F1_B357630F3194" name="epo:isVariant">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000775_3D63_4690_82F1_B357630F3194" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000776_3D63_4690_82F1_B357630F3194" 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_LI000753_E2B5_4316_8B14_C02E3FA048F0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000754_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_LI000755_E3C9_4487_8DC0_2F870FD3CE34" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000756_E3C9_4487_8DC0_2F870FD3CE34" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst1426FE_407B_41cc_8545_0E43CC2AD3BA" name="epo:isSupportedBy" association="EAID_131426FE_407B_41cc_8545_0E43CC2AD3BA">
+							<type xmi:idref="EAID_640F316F_44B1_44a6_9B37_FD17A852946F"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000777__407B_41cc_8545_0E43CC2AD3BA" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000778__407B_41cc_8545_0E43CC2AD3BA" value="1"/>
 						</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_LI000757__4706_4097_A6E7_D6BCEF598E62" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000758__4706_4097_A6E7_D6BCEF598E62" value="1"/>
+						<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_LI000779__D269_4cfe_A646_9A2FDEE01B0F" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000780__D269_4cfe_A646_9A2FDEE01B0F" value="*"/>
 						</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_LI000759__139F_4712_8BB6_681888ACB178" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000760__139F_4712_8BB6_681888ACB178" value="*"/>
+						<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_LI000781__71D8_4ef9_919E_87DD36154F85" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000782__71D8_4ef9_919E_87DD36154F85" 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_LI000761__821C_40da_B5DE_D7ED82169378" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000762__821C_40da_B5DE_D7ED82169378" value="*"/>
+						<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_LI000783__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000784__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
 						</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_LI000763__433B_4242_826E_974C4A3AEF87" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000764__433B_4242_826E_974C4A3AEF87" value="*"/>
+						<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_LI000785__635F_49aa_B61D_661F42799A98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000786__635F_49aa_B61D_661F42799A98" value="1"/>
 						</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_LI000765__0FBB_48f1_B54C_5FBB7973D2FA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000766__0FBB_48f1_B54C_5FBB7973D2FA" value="1"/>
+						<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_LI000787__06E0_4141_9CF5_2CFE5FEB856B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000788__06E0_4141_9CF5_2CFE5FEB856B" value="*"/>
 						</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_LI000767__8A73_411c_B751_1F0998CC86A7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000768__8A73_411c_B751_1F0998CC86A7" value="*"/>
+						<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_LI000789__B09A_4855_B489_34E46CFF8E24" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000790__B09A_4855_B489_34E46CFF8E24" value="1"/>
 						</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_LI000769__672E_4208_A39E_E74480CCE1D0" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000770__672E_4208_A39E_E74480CCE1D0" value="*"/>
+						<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_LI000791__4329_4e57_9F78_AF7887C44E46" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000792__4329_4e57_9F78_AF7887C44E46" value="1"/>
 						</ownedAttribute>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
-						<memberEnd xmi:idref="EAID_dst23E4D3_4706_4097_A6E7_D6BCEF598E62"/>
-						<memberEnd xmi:idref="EAID_src23E4D3_4706_4097_A6E7_D6BCEF598E62"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src23E4D3_4706_4097_A6E7_D6BCEF598E62" association="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
-							<type xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-						</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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
-						<memberEnd xmi:idref="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA"/>
-						<memberEnd xmi:idref="EAID_srcFFCDAE_C459_4420_9649_6F7949D3D9BA"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcFFCDAE_C459_4420_9649_6F7949D3D9BA" association="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
-							<type xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-						</ownedEnd>
-					</packagedElement>
-					<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_LI000771__6E1E_4123_A7F5_548146C45BC4" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000772__6E1E_4123_A7F5_548146C45BC4" value="*"/>
+						<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_LI000793__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000794__4B4E_44c9_AD20_DD8131AF4BEF" value="1"/>
 						</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_LI000773__35C4_4015_80BE_9C778A0BA2A5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000774__35C4_4015_80BE_9C778A0BA2A5" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_dst39FB34_0EE7_4244_8378_D6711720B09B" name="epo:isSupportedBy" association="EAID_F039FB34_0EE7_4244_8378_D6711720B09B">
+							<type xmi:idref="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000795__0EE7_4244_8378_D6711720B09B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000796__0EE7_4244_8378_D6711720B09B" value="1"/>
 						</ownedAttribute>
-						<generalization xmi:type="uml:Generalization" xmi:id="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" general="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-						<memberEnd xmi:idref="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F"/>
-						<memberEnd xmi:idref="EAID_src732599_332F_4f0e_BFE6_593632EDB11F"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src732599_332F_4f0e_BFE6_593632EDB11F" association="EAID_20732599_332F_4f0e_BFE6_593632EDB11F">
-							<type xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
-						<memberEnd xmi:idref="EAID_dst56734D_7238_4738_9F80_EC054ABA2E24"/>
-						<memberEnd xmi:idref="EAID_src56734D_7238_4738_9F80_EC054ABA2E24"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src56734D_7238_4738_9F80_EC054ABA2E24" association="EAID_3656734D_7238_4738_9F80_EC054ABA2E24">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_131426FE_407B_41cc_8545_0E43CC2AD3BA">
+						<memberEnd xmi:idref="EAID_dst1426FE_407B_41cc_8545_0E43CC2AD3BA"/>
+						<memberEnd xmi:idref="EAID_src1426FE_407B_41cc_8545_0E43CC2AD3BA"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src1426FE_407B_41cc_8545_0E43CC2AD3BA" association="EAID_131426FE_407B_41cc_8545_0E43CC2AD3BA">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
-						<memberEnd xmi:idref="EAID_dst9050E1_4285_45aa_87A9_6A9BA62CD554"/>
-						<memberEnd xmi:idref="EAID_src9050E1_4285_45aa_87A9_6A9BA62CD554"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9050E1_4285_45aa_87A9_6A9BA62CD554" association="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+					<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_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-						<memberEnd xmi:idref="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547"/>
-						<memberEnd xmi:idref="EAID_srcB4981B_F0BC_4d9f_9B16_DD484C6E2547"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB4981B_F0BC_4d9f_9B16_DD484C6E2547" association="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+					<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:Association" xmi:id="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
-						<memberEnd xmi:idref="EAID_dstA06CD6_3F60_4e8f_A32A_669CA4829E33"/>
-						<memberEnd xmi:idref="EAID_srcA06CD6_3F60_4e8f_A32A_669CA4829E33"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcA06CD6_3F60_4e8f_A32A_669CA4829E33" association="EAID_53A06CD6_3F60_4e8f_A32A_669CA4829E33">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F039FB34_0EE7_4244_8378_D6711720B09B">
+						<memberEnd xmi:idref="EAID_dst39FB34_0EE7_4244_8378_D6711720B09B"/>
+						<memberEnd xmi:idref="EAID_src39FB34_0EE7_4244_8378_D6711720B09B"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src39FB34_0EE7_4244_8378_D6711720B09B" association="EAID_F039FB34_0EE7_4244_8378_D6711720B09B">
+							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
-						<memberEnd xmi:idref="EAID_dstB64699_B98C_49f8_AAA8_01BAEEF0DD49"/>
-						<memberEnd xmi:idref="EAID_srcB64699_B98C_49f8_AAA8_01BAEEF0DD49"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcB64699_B98C_49f8_AAA8_01BAEEF0DD49" association="EAID_55B64699_B98C_49f8_AAA8_01BAEEF0DD49">
-							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
+					<packagedElement xmi:type="uml:Association" xmi:id="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
+						<memberEnd xmi:idref="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF"/>
+						<memberEnd xmi:idref="EAID_srcE75552_13BB_48c2_A5D7_18A876BF10CF"/>
+						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcE75552_13BB_48c2_A5D7_18A876BF10CF" association="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
+							<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
-						<memberEnd xmi:idref="EAID_dst55842B_BD0C_4fab_8681_C210E308328D"/>
-						<memberEnd xmi:idref="EAID_src55842B_BD0C_4fab_8681_C210E308328D"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src55842B_BD0C_4fab_8681_C210E308328D" association="EAID_7355842B_BD0C_4fab_8681_C210E308328D">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" name="contract">
+						<packagedElement xmi:type="uml:Class" xmi:id="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" name="epo:ConcessionContract">
+							<generalization xmi:type="uml:Generalization" xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" general="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+						</packagedElement>
+						<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_LI000797_EE66_4466_B876_2648A2FCB695" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000798_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_LI000799_FF03_40dc_B883_35A17CF5DA90" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000800_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_LI000801__50E1_40f7_8F66_FA023FA190E7" value="1"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000802__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_LI000803__5876_4d85_8FFB_CD1622DAF44A" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000804__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_LI000805__76C7_486a_9953_EA1E6D255A89" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000806__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_LI000807__2B60_4f59_8AE5_E5806C9B2562" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000808__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_LI000809__DC8E_4fd4_8A9A_9A4173CBD283" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000810__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_LI000811__F8BB_4c6f_9356_F67CF0DAA096" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000812__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_LI000813__A9AF_47c5_B217_F52FFB1CAD53" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000814__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_LI000815__0CAC_40d5_A730_696A39D2224E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000816__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_LI000817__CD1A_40df_9C2D_9222DAB14E19" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000818__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_LI000819__26BC_46b1_A885_D5B3B1D5960A" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000820__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_LI000821__13BB_48c2_A5D7_18A876BF10CF" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000822__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_LI000823__CE05_4098_ADF6_2FEC3A1BB755" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000824__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_LI000825__7D35_48ab_B0AA_8C6787D5DF46" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000826__7D35_48ab_B0AA_8C6787D5DF46" value="*"/>
+							</ownedAttribute>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+							<memberEnd xmi:idref="EAID_dstBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
+							<memberEnd xmi:idref="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcBE1638_5876_4d85_8FFB_CD1622DAF44A" association="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+								<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
+							<memberEnd xmi:idref="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89"/>
+							<memberEnd xmi:idref="EAID_src20FB6D_76C7_486a_9953_EA1E6D255A89"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src20FB6D_76C7_486a_9953_EA1E6D255A89" association="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
+								<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
+							<memberEnd xmi:idref="EAID_dst14DE2C_F8BB_4c6f_9356_F67CF0DAA096"/>
+							<memberEnd xmi:idref="EAID_src14DE2C_F8BB_4c6f_9356_F67CF0DAA096"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src14DE2C_F8BB_4c6f_9356_F67CF0DAA096" association="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
+								<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
+							<memberEnd xmi:idref="EAID_dst41BADB_0CAC_40d5_A730_696A39D2224E"/>
+							<memberEnd xmi:idref="EAID_src41BADB_0CAC_40d5_A730_696A39D2224E"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src41BADB_0CAC_40d5_A730_696A39D2224E" association="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
+								<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							</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"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcD708FC_CE05_4098_ADF6_2FEC3A1BB755" association="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
+								<type xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_1326915C_1564_403a_A96E_65DCEC3F641A">
+							<memberEnd xmi:idref="EAID_dst26915C_1564_403a_A96E_65DCEC3F641A"/>
+							<memberEnd xmi:idref="EAID_src26915C_1564_403a_A96E_65DCEC3F641A"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src26915C_1564_403a_A96E_65DCEC3F641A" association="EAID_1326915C_1564_403a_A96E_65DCEC3F641A">
+								<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
+							<memberEnd xmi:idref="EAID_dstEB6ABB_DB35_4b96_9E46_695F79EE21E5"/>
+							<memberEnd xmi:idref="EAID_srcEB6ABB_DB35_4b96_9E46_695F79EE21E5"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcEB6ABB_DB35_4b96_9E46_695F79EE21E5" association="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
+								<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+							<memberEnd xmi:idref="EAID_dstC1B1D3_F31C_482d_82B0_7ED4BAC17D43"/>
+							<memberEnd xmi:idref="EAID_srcC1B1D3_F31C_482d_82B0_7ED4BAC17D43"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcC1B1D3_F31C_482d_82B0_7ED4BAC17D43" association="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+								<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+							<memberEnd xmi:idref="EAID_dst2A2E13_AE75_4b0d_B325_4443E0BF6A2D"/>
+							<memberEnd xmi:idref="EAID_src2A2E13_AE75_4b0d_B325_4443E0BF6A2D"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src2A2E13_AE75_4b0d_B325_4443E0BF6A2D" association="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+								<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+							</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"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9B4B6E_15E8_4ec4_876B_BEE9D986B4DA" association="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+								<type xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
+							<memberEnd xmi:idref="EAID_dst9DC2F8_C373_4894_AF6D_C4779365607A"/>
+							<memberEnd xmi:idref="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src9DC2F8_C373_4894_AF6D_C4779365607A" association="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
+								<type xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
+							<memberEnd xmi:idref="EAID_dst94D054_08DB_4bb5_A279_498213B45F8E"/>
+							<memberEnd xmi:idref="EAID_src94D054_08DB_4bb5_A279_498213B45F8E"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src94D054_08DB_4bb5_A279_498213B45F8E" association="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
+								<type xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+							<memberEnd xmi:idref="EAID_dstF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
+							<memberEnd xmi:idref="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF64E25_5DAC_4cec_8EE0_33C8C2F66C12" association="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+								<type xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556"/>
+							</ownedEnd>
+						</packagedElement>
+						<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_LI000827__EBFD_419c_8F21_8256FE25DBAC" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000828__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>
+						<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_LI000829__85B9_4435_B7E7_D176E6996280" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000830__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>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
+							<memberEnd xmi:idref="EAID_dst8065CA_2D18_479d_95EB_23D106ED6921"/>
+							<memberEnd xmi:idref="EAID_src8065CA_2D18_479d_95EB_23D106ED6921"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8065CA_2D18_479d_95EB_23D106ED6921" association="EAID_D68065CA_2D18_479d_95EB_23D106ED6921">
+								<type xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8"/>
+							</ownedEnd>
+						</packagedElement>
+						<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_LI000831_DF5F_4be0_AF69_D4FBC1D44760" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000832_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_LI000833_1B7A_459a_86B8_A6AD56C43AA1" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000834_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_LI000835_B5EB_429a_B2C2_846F2F33BCEE" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000836_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_LI000837__BC4D_44e9_957C_60FF1C08941F" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000838__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: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_LI000839__2D18_479d_95EB_23D106ED6921" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000840__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_LI000841__BE4C_49d2_A743_BAD5FFBD3003" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000842__BE4C_49d2_A743_BAD5FFBD3003" value="1"/>
+							</ownedAttribute>
+						</packagedElement>
 					</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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src990D3C_51ED_4626_9195_C96F98BD3349" association="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349">
-							<type xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-						</ownedEnd>
+					<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" name="review">
+						<ownedComment xmi:type="uml:Comment" xmi:id="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" body="What are the entities that can be reviewed?">
+							<annotatedElement xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+						</ownedComment>
+						<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_LI000843_CB77_4e9d_93C3_62DD41ADF53D" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000844_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_LI000845__2F48_4952_926C_444F368462AA" value="1"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000846__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_LI000847__1403_4dcc_B7C6_33C21269E183" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000848__1403_4dcc_B7C6_33C21269E183" value="1"/>
+							</ownedAttribute>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA">
+							<memberEnd xmi:idref="EAID_dst63763E_2F48_4952_926C_444F368462AA"/>
+							<memberEnd xmi:idref="EAID_src63763E_2F48_4952_926C_444F368462AA"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src63763E_2F48_4952_926C_444F368462AA" association="EAID_9663763E_2F48_4952_926C_444F368462AA">
+								<type xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32"/>
+							</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_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_LI000849_50C9_427a_A35D_6F824C0B5371" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000850_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_LI000851_A663_4c85_A496_E79BDE625A17" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000852_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_LI000853__EDE9_461d_85E1_1ABB6B9E21EB" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000854__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>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
+							<memberEnd xmi:idref="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB"/>
+							<memberEnd xmi:idref="EAID_src33CDC7_EDE9_461d_85E1_1ABB6B9E21EB"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" association="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
+								<type xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+							</ownedEnd>
+						</packagedElement>
+						<packagedElement xmi:type="uml:Association" xmi:id="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
+							<memberEnd xmi:idref="EAID_dst34B051_9C2E_444e_83DD_D95F6EA9897B"/>
+							<memberEnd xmi:idref="EAID_src34B051_9C2E_444e_83DD_D95F6EA9897B"/>
+							<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src34B051_9C2E_444e_83DD_D95F6EA9897B" association="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B">
+								<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
+							</ownedEnd>
+						</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_LI000855_0CD1_4414_A52F_5BC33374FE6D" value="1"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000856_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_LI000857_D59B_44ce_A5E7_049DA74AA55E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000858_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_LI000859_C11F_437d_8F7E_44D4FAF1B79E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000860_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_LI000861_E023_4686_B908_2AA037456757" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000862_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_LI000863_37CA_4488_BBCA_E16D118CC6D8" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000864_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_LI000865__06B8_43e0_AB80_8F686D5C488E" value="0"/>
+								<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000866__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>
-					<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_LI000775__7CD7_4f69_89C8_D3FC52D7CF0C" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000776__7CD7_4f69_89C8_D3FC52D7CF0C" value="*"/>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" name="notice description">
+					<ownedComment xmi:type="uml:Comment" xmi:id="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" body="Added hasAdditionalInformation to cover for section VII.2 in F14, since we do not have the Corrigendum notice type anymore in eForms.">
+						<annotatedElement xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+					</ownedComment>
+					<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_LI000867_CE97_49d3_8482_D1EAA764E7D8" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000868_CE97_49d3_8482_D1EAA764E7D8" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000777__C459_4420_9649_6F7949D3D9BA" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000778__C459_4420_9649_6F7949D3D9BA" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_02F1FD10_4A7F_44a3_90AE_DC4CE167531B" name="epo:hasChangeReasonDescription">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000869_4A7F_44a3_90AE_DC4CE167531B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000870_4A7F_44a3_90AE_DC4CE167531B" value="*"/>
+							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</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_LI000779__A434_424a_8ECC_D32EF06886BB" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000780__A434_424a_8ECC_D32EF06886BB" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_47233B60_638C_465b_985C_46C4F92E2998" name="epo:isProcurementDocumentChanged">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000871_638C_465b_985C_46C4F92E2998" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000872_638C_465b_985C_46C4F92E2998" value="1"/>
+							<type xmi:idref="EAJava_xsd_boolean"/>
 						</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_LI000781__378D_4c18_9647_0E2E150D7463" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000782__378D_4c18_9647_0E2E150D7463" value="1"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_DD81DA72_316E_4eed_9253_86D09F747DE7" name="epo:hasProcurementDocumentChangeDate">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000873_316E_4eed_9253_86D09F747DE7" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000874_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_LI000875_6A09_4dd9_A1E2_34E02F94BF9A" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000876_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_LI000877__60D1_44cb_BC5F_08B65291C2AC" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000878__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_LI000879__94B3_445f_ACA6_A903591C3651" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000880__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_LI000881__EF1A_4230_BB7E_A40906D6ED97" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000882__EF1A_4230_BB7E_A40906D6ED97" 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"/>
+					<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_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"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" association="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
-							<type xmi:idref="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B"/>
-						</ownedEnd>
-					</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_LI000783_2B58_40de_B8E7_6698AA589C5E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000784_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_LI000785_62A0_40d3_B39B_A3C66EAE9CD7" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000786_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_LI000787_0ACB_4905_9E98_37EB4AD1C8CE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000788_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_LI000789_A5AA_4582_8838_5A6AE79C81A6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000790_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_LI000791_E2E5_420f_B454_601D03392D27" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000792_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_LI000793__FD33_4153_9939_FA613CEB5D22" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000794__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_LI000795__E1D3_4c16_AB2B_CBE8A5D24AC5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000796__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_LI000797__5092_48cf_878A_8035A42A43F9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000798__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_LI000799__5AC2_42b1_AA17_2A8EC003CCFE" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000800__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_LI000801__51ED_4626_9195_C96F98BD3349" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000802__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_LI000803__7F36_41c3_8166_36C3538F2F3A" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000804__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"/>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
-						<memberEnd xmi:idref="EAID_dst762169_952E_4db0_9FE7_6B4A895F2AF1"/>
-						<memberEnd xmi:idref="EAID_src762169_952E_4db0_9FE7_6B4A895F2AF1"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src762169_952E_4db0_9FE7_6B4A895F2AF1" association="EAID_A5762169_952E_4db0_9FE7_6B4A895F2AF1">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
-						<memberEnd xmi:idref="EAID_dstF23C3F_F74B_434a_AA2D_59AF706E79E6"/>
-						<memberEnd xmi:idref="EAID_srcF23C3F_F74B_434a_AA2D_59AF706E79E6"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF23C3F_F74B_434a_AA2D_59AF706E79E6" association="EAID_AEF23C3F_F74B_434a_AA2D_59AF706E79E6">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_B1307E49_0838_4569_819E_D05D699E0983">
-						<memberEnd xmi:idref="EAID_dst307E49_0838_4569_819E_D05D699E0983"/>
-						<memberEnd xmi:idref="EAID_src307E49_0838_4569_819E_D05D699E0983"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src307E49_0838_4569_819E_D05D699E0983" association="EAID_B1307E49_0838_4569_819E_D05D699E0983">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
-						<memberEnd xmi:idref="EAID_dst65A241_4CD0_4009_A42F_041D198E70E4"/>
-						<memberEnd xmi:idref="EAID_src65A241_4CD0_4009_A42F_041D198E70E4"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src65A241_4CD0_4009_A42F_041D198E70E4" association="EAID_F365A241_4CD0_4009_A42F_041D198E70E4">
-							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
-						<memberEnd xmi:idref="EAID_dstAC099A_F1E0_4926_9F7B_6C2B6C33321B"/>
-						<memberEnd xmi:idref="EAID_srcAC099A_F1E0_4926_9F7B_6C2B6C33321B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAC099A_F1E0_4926_9F7B_6C2B6C33321B" association="EAID_F5AC099A_F1E0_4926_9F7B_6C2B6C33321B">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
-					</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_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_LI000805__332F_4f0e_BFE6_593632EDB11F" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000806__332F_4f0e_BFE6_593632EDB11F" 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_LI000807__3A48_4541_8467_9DDA71E8D534" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000808__3A48_4541_8467_9DDA71E8D534" 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_LI000809__3362_472f_B087_27A619B6C819" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000810__3362_472f_B087_27A619B6C819" value="*"/>
-						</ownedAttribute>
-					</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_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
-						<memberEnd xmi:idref="EAID_dstDACA2B_8A10_4516_8C96_D5EA3AE635E9"/>
-						<memberEnd xmi:idref="EAID_srcDACA2B_8A10_4516_8C96_D5EA3AE635E9"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcDACA2B_8A10_4516_8C96_D5EA3AE635E9" association="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9">
-							<type xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
-						<memberEnd xmi:idref="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98"/>
-						<memberEnd xmi:idref="EAID_src5EC3B7_635F_49aa_B61D_661F42799A98"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src5EC3B7_635F_49aa_B61D_661F42799A98" association="EAID_7B5EC3B7_635F_49aa_B61D_661F42799A98">
-							<type xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
-						<memberEnd xmi:idref="EAID_dst6CC936_0C78_48b9_A44A_1D010626BE9B"/>
-						<memberEnd xmi:idref="EAID_src6CC936_0C78_48b9_A44A_1D010626BE9B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src6CC936_0C78_48b9_A44A_1D010626BE9B" association="EAID_896CC936_0C78_48b9_A44A_1D010626BE9B">
-							<type xmi:idref="EAID_17662AEF_1321_446a_AE42_0583F7417A79"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
-						<memberEnd xmi:idref="EAID_dstCB407C_08A7_467b_8826_322D82AB6DB0"/>
-						<memberEnd xmi:idref="EAID_srcCB407C_08A7_467b_8826_322D82AB6DB0"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcCB407C_08A7_467b_8826_322D82AB6DB0" association="EAID_BCCB407C_08A7_467b_8826_322D82AB6DB0">
-							<type xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
-						<memberEnd xmi:idref="EAID_dstF18DD0_9007_48f0_9959_5EE6A49DDD1B"/>
-						<memberEnd xmi:idref="EAID_srcF18DD0_9007_48f0_9959_5EE6A49DDD1B"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcF18DD0_9007_48f0_9959_5EE6A49DDD1B" association="EAID_C6F18DD0_9007_48f0_9959_5EE6A49DDD1B">
-							<type xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
-						<memberEnd xmi:idref="EAID_dstAB3946_257D_4382_A283_8978FB00BD51"/>
-						<memberEnd xmi:idref="EAID_srcAB3946_257D_4382_A283_8978FB00BD51"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_srcAB3946_257D_4382_A283_8978FB00BD51" association="EAID_D6AB3946_257D_4382_A283_8978FB00BD51">
-							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
-						</ownedEnd>
-					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-						<memberEnd xmi:idref="EAID_dst36A935_6B61_49a0_A901_D1A6B9C4D5A7"/>
-						<memberEnd xmi:idref="EAID_src36A935_6B61_49a0_A901_D1A6B9C4D5A7"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src36A935_6B61_49a0_A901_D1A6B9C4D5A7" association="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7">
-							<type xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524"/>
-						</ownedEnd>
-					</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_LI000811_2E9E_40ca_8D61_5175A4D36F9E" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000812_2E9E_40ca_8D61_5175A4D36F9E" value="*"/>
-							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
+					<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: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_LI000883_CA65_4203_912D_52E9A6F5BE28" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000884_CA65_4203_912D_52E9A6F5BE28" value="1"/>
+							<type xmi:idref="EAJava_xsd_date"/>
 						</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_LI000813_94C7_44ae_BA93_BC77CD3943C8" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000814_94C7_44ae_BA93_BC77CD3943C8" value="*"/>
+						<ownedAttribute xmi:type="uml:Property" xmi:id="EAID_3CBF449C_4234_4f51_9B91_AEF3E04AF3F0" name="epo:hasConfidentialityJustification">
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000885_4234_4f51_9B91_AEF3E04AF3F0" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000886_4234_4f51_9B91_AEF3E04AF3F0" value="1"/>
 							<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_LI000815__574B_4f10_925C_C2404C3C5805" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000816__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_LI000817__387D_467a_95E2_ACDA293AE181" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000818__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_LI000819__6ADC_4a69_9C87_1543CFCC17D9" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000820__6ADC_4a69_9C87_1543CFCC17D9" value="1"/>
+						<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_LI000887__50A9_4b54_8B7C_0A19B505F52F" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000888__50A9_4b54_8B7C_0A19B505F52F" 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">
+						<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_LI000821__C207_456a_A0EF_B68899832EE8" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000822__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_LI000823__3CD9_464a_82E7_387507253B10" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000824__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_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_LI000825_4C0A_478a_ABA1_C730072CAB97" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000826_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_LI000827_3D63_4690_82F1_B357630F3194" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000828_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_LI000829__D269_4cfe_A646_9A2FDEE01B0F" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000830__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_LI000831__71D8_4ef9_919E_87DD36154F85" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000832__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_LI000833__F0BC_4d9f_9B16_DD484C6E2547" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000834__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_LI000835__635F_49aa_B61D_661F42799A98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000836__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_LI000837__06E0_4141_9CF5_2CFE5FEB856B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000838__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_LI000839__B09A_4855_B489_34E46CFF8E24" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000840__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_LI000841__4329_4e57_9F78_AF7887C44E46" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000842__4329_4e57_9F78_AF7887C44E46" value="1"/>
-						</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_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
-						<memberEnd xmi:idref="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5"/>
-						<memberEnd xmi:idref="EAID_src8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" association="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
-							<type xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E"/>
-						</ownedEnd>
-					</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_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_LI000843__0ADB_4c2a_A8CB_6EBF4CDA67D5" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000844__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_LI000845__93F7_4d51_A677_A1E36D3B53C0" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000846__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_LI000847__257D_4382_A283_8978FB00BD51" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000848__257D_4382_A283_8978FB00BD51" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000889__201D_47cb_BCF7_9C5A5DD40C4B" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000890__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>
-					<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"/>
+					<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>
-				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" name="controlled vocabularies">
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" name="at-voc:accessibility"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" name="at-voc:applicability"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" name="at-voc:award-criterion-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" name="at-voc:buyer-legal-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" name="at-voc:change-corrig-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" name="at-voc:communication-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" name="at-voc:confidentiality-level"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" name="at-voc:contract-nature"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" name="at-voc:country"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" name="at-voc:cpv"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_31165801_5B33_4e47_B39A_04F149020988" name="at-voc:criterion"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" name="at-voc:currency"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" name="at-voc:cvd-contract-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" name="at-voc:direct-award-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" name="at-voc:dps-usage"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" name="at-voc:economic-operator-size"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" name="at-voc:environmental-impact"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C" name="at-voc:EU-programme"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" name="at-voc:form-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_2EEC390D_B44F_4505_8179_765B845FE27F" name="at-voc:framework-agreement"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" name="at-voc:green-public-procurement-criteria"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" name="at-voc:innovative-acquisition"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0CC18385_984E_4d4c_A942_07304CE66481" name="at-voc:irregularity-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" name="at-voc:language"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" name="at-voc:legal-basis"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" name="at-voc:main-activity"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" name="at-voc:measurement-unit"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" name="at-voc:missing-info-submission"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" name="at-voc:modification-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D46376EC_6B98_4926_8627_A594E6819D78" name="at-voc:non-award-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931" name="at-voc:non-publication-justification"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" name="at-voc:notice-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" name="at-voc:number-fixed"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_02014F61_A766_467e_BD3D_7F41689C651B" name="at-voc:number-threshold"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" name="at-voc:number-weight"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" name="at-voc:nuts"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B" name="at-voc:other-place-service"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" name="at-voc:permission"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" name="at-voc:procurement-procedure-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_12955701_35A4_47c8_8EA6_28768E083EED" name="at-voc:received-submission-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" name="at-voc:remedy-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" name="at-voc:requirement-stage"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" name="at-voc:reserved-procurement"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" name="at-voc:review-body-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" name="at-voc:review-decision-type"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2" name="at-voc:selection-criterion"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" name="at-voc:social-objective"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" name="at-voc:subcontracting-indication"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011" name="at-voc:subcontracting-obligation"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" name="at-voc:timeperiod"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" name="at-voc:usage"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" name="at-voc:vehicle-category"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" name="at-voc:winner-selection-status"/>
-					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" name="time:TemporalUnit"/>
+					<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>
 				<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_LI000849_2536_4ae0_A606_3868B9A27714" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000850_2536_4ae0_A606_3868B9A27714" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000891_2536_4ae0_A606_3868B9A27714" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000892_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_LI000851_C9A2_45ce_A2E4_3AFC67778C5B" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000852_C9A2_45ce_A2E4_3AFC67778C5B" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000893_C9A2_45ce_A2E4_3AFC67778C5B" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000894_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_LI000853_532F_4950_B4BF_22835EC1F3E6" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000854_532F_4950_B4BF_22835EC1F3E6" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000895_532F_4950_B4BF_22835EC1F3E6" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000896_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_LI000855_574A_4a69_9F19_59FCED4CCEFC" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000856_574A_4a69_9F19_59FCED4CCEFC" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000897_574A_4a69_9F19_59FCED4CCEFC" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000898_574A_4a69_9F19_59FCED4CCEFC" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -4723,23 +4964,23 @@
 					</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_LI000857_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000858_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000899_E6DC_49ee_8B5D_E915D4361E9C" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000900_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_LI000859_A1AF_4a19_A650_4A057D5FB465" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000860_A1AF_4a19_A650_4A057D5FB465" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000901_A1AF_4a19_A650_4A057D5FB465" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000902_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_LI000861_87A2_428c_A675_CD62FC2FF951" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000862_87A2_428c_A675_CD62FC2FF951" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000903_87A2_428c_A675_CD62FC2FF951" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000904_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_LI000863_9DC4_4cbd_8A9D_15BCC4606424" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000864_9DC4_4cbd_8A9D_15BCC4606424" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000905_9DC4_4cbd_8A9D_15BCC4606424" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000906_9DC4_4cbd_8A9D_15BCC4606424" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -4879,13 +5120,13 @@
 					</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_LI000865_7F34_4839_ADEB_482CEC470A98" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000866_7F34_4839_ADEB_482CEC470A98" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000907_7F34_4839_ADEB_482CEC470A98" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000908_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_LI000867_AF7C_45ab_927B_B38B2CEBC0D5" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000868_AF7C_45ab_927B_B38B2CEBC0D5" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000909_AF7C_45ab_927B_B38B2CEBC0D5" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000910_AF7C_45ab_927B_B38B2CEBC0D5" value="1"/>
 							<type xmi:idref="EAJava_xsd_dateTime"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -4897,13 +5138,6 @@
 							<type xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8"/>
 						</ownedEnd>
 					</packagedElement>
-					<packagedElement xmi:type="uml:Association" xmi:id="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-						<memberEnd xmi:idref="EAID_dst64913C_FE85_48db_829F_004DFE769A97"/>
-						<memberEnd xmi:idref="EAID_src64913C_FE85_48db_829F_004DFE769A97"/>
-						<ownedEnd xmi:type="uml:Property" xmi:id="EAID_src64913C_FE85_48db_829F_004DFE769A97" association="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-							<type xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-						</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"/>
@@ -4934,13 +5168,13 @@
 					</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_LI000869_4789_4775_8650_9C585138E43E" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000870_4789_4775_8650_9C585138E43E" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000911_4789_4775_8650_9C585138E43E" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000912_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_LI000871_8BB5_4491_A8AD_C3C93FA46553" value="0"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000872_8BB5_4491_A8AD_C3C93FA46553" value="*"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000913_8BB5_4491_A8AD_C3C93FA46553" value="0"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000914_8BB5_4491_A8AD_C3C93FA46553" value="*"/>
 							<type xmi:idref="EAJava_rdf_PlainLiteral"/>
 						</ownedAttribute>
 					</packagedElement>
@@ -5143,14 +5377,71 @@
 					</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_LI000873_FC67_4252_86EC_D1E5C696FA85" value="1"/>
-							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000874_FC67_4252_86EC_D1E5C696FA85" value="1"/>
+							<lowerValue xmi:type="uml:LiteralInteger" xmi:id="EAID_LI000915_FC67_4252_86EC_D1E5C696FA85" value="1"/>
+							<upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="EAID_LI000916_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>
+				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" name="controlled vocabularies">
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" name="at-voc:accessibility"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" name="at-voc:applicability"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8" name="at-voc:award-criterion-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" name="at-voc:buyer-legal-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" name="at-voc:change-corrig-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" name="at-voc:communication-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" name="at-voc:confidentiality-level"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" name="at-voc:contract-nature"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" name="at-voc:country"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" name="at-voc:cpv"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_31165801_5B33_4e47_B39A_04F149020988" name="at-voc:criterion"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FBD046CD_CD18_4d96_99E0_63CAC8A5D594" name="at-voc:currency"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" name="at-voc:cvd-contract-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" name="at-voc:direct-award-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" name="at-voc:dps-usage"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" name="at-voc:economic-operator-size"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" name="at-voc:environmental-impact"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C" name="at-voc:EU-programme"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" name="at-voc:form-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_2EEC390D_B44F_4505_8179_765B845FE27F" name="at-voc:framework-agreement"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" name="at-voc:green-public-procurement-criteria"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" name="at-voc:innovative-acquisition"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0CC18385_984E_4d4c_A942_07304CE66481" name="at-voc:irregularity-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" name="at-voc:language"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" name="at-voc:legal-basis"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" name="at-voc:main-activity"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_EA832FE6_7876_41f8_A610_DCE4C9E2C0F3" name="at-voc:measurement-unit"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" name="at-voc:missing-info-submission"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C39641DF_A778_418a_94EE_8405EFE534AF" name="at-voc:modification-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D46376EC_6B98_4926_8627_A594E6819D78" name="at-voc:non-award-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931" name="at-voc:non-publication-justification"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282" name="at-voc:notice-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" name="at-voc:number-fixed"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_02014F61_A766_467e_BD3D_7F41689C651B" name="at-voc:number-threshold"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" name="at-voc:number-weight"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" name="at-voc:nuts"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B" name="at-voc:other-place-service"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" name="at-voc:permission"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" name="at-voc:procurement-procedure-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_12955701_35A4_47c8_8EA6_28768E083EED" name="at-voc:received-submission-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" name="at-voc:remedy-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" name="at-voc:requirement-stage"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" name="at-voc:reserved-procurement"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" name="at-voc:review-body-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" name="at-voc:review-decision-type"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2" name="at-voc:selection-criterion"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" name="at-voc:social-objective"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" name="at-voc:subcontracting-indication"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011" name="at-voc:subcontracting-obligation"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" name="at-voc:timeperiod"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" name="at-voc:usage"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D" name="at-voc:vehicle-category"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0" name="at-voc:winner-selection-status"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" name="time:TemporalUnit"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" name="at-voc-new:certification-label-type"/>
+				</packagedElement>
 			</packagedElement>
 			<packagedElement xmi:type="uml:Package" xmi:id="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" name="datatype">
 				<packagedElement xmi:type="uml:DataType" xmi:id="EAID_34A02EE8_6CDA_49bc_8783_42E1045AB156" name="rdf:PlainLiteral"/>
@@ -5183,31 +5474,23 @@
 				<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_A694_24FCCC3FFDA5" modelElement="EAID_12170F5C_506A_44bf_A694_24FCCC3FFDA5">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A694_24FCCC3FFDA5" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A694_24FCCC3FFDA5" x="763" 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="947" y="247" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_865E_AA3D8CABF489" modelElement="EAID_31EA4D18_AE52_4312_865E_AA3D8CABF489">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_865E_AA3D8CABF489" text="NavigationCell"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_865E_AA3D8CABF489" text="monetary value - competition"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_865E_AA3D8CABF489" x="27" y="439" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_B978_81AE2B81BF17" x="762" 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="211" y="439" width="170" height="115"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_93F3_A9FAE5CE18B1" text="monetary value - competition"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_93F3_A9FAE5CE18B1" x="27" 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="395" y="439" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_AB06_08AA082CD52B" x="211" 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="579" y="439" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9F81_DB71EAB73C34" x="395" y="439" width="170" height="115"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_945B_60FA54013A48" modelElement="EAID_FA67183F_38CC_4aa6_945B_60FA54013A48">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_945B_60FA54013A48" text="NavigationCell"/>
@@ -5233,39 +5516,27 @@
 				<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_A930_EAEFF23E8568" modelElement="EAID_D328B002_DFC9_487f_A930_EAEFF23E8568">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A930_EAEFF23E8568" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A930_EAEFF23E8568" x="582" y="1093" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A11A_33482161EFBA" modelElement="EAID_C51CEE38_0715_4c7f_A11A_33482161EFBA">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A11A_33482161EFBA" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A11A_33482161EFBA" x="769" y="1093" width="170" height="115"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_7C7E5BCA_D4BF_435c_A3EA_854B47E10131" modelElement="EAID_0E2769F1_F27B_445a_A3EA_854B47E10131">
-				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_A3EA_854B47E10131" text="NavigationCell"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_A3EA_854B47E10131" x="958" y="1093" 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="210" y="1093" width="170" height="115"/>
+				<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="398" y="1093" width="170" height="115"/>
+				<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_8CFF_5424B393E918" modelElement="EAID_0B563D27_1575_48a5_8CFF_5424B393E918">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_D4BF_435c_8CFF_5424B393E918" text="NavigationCell"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_D4BF_435c_8CFF_5424B393E918" text="procurement criterion"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8CFF_5424B393E918" x="772" y="642" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8CFF_5424B393E918" x="967" y="642" 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="393" y="642" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_9EE2_A6F61F870DB6" x="581" y="642" 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="581" y="642" width="170" height="115"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_D4BF_435c_8E8A_A6EC221BAB4F" x="774" y="642" 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"/>
@@ -5329,7 +5600,7 @@
 		<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="161" height="59"/>
+				<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"/>
@@ -5341,7 +5612,7 @@
 			</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="1257" y="285" width="273" height="64"/>
+				<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"/>
@@ -5349,7 +5620,7 @@
 			</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="1682" y="409" width="216" height="98"/>
+				<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"/>
@@ -5365,11 +5636,7 @@
 			</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="161" height="59"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_BE36C015_6DEA_4e64_A084_E51BAA1CF00D" modelElement="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_6DEA_4e64_A084_E51BAA1CF00D" text="epo:ProcedureTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_6DEA_4e64_A084_E51BAA1CF00D" x="449" y="733" width="287" height="189"/>
+				<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"/>
@@ -5377,7 +5644,7 @@
 			</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="0" y="320" width="282" height="85"/>
+				<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"/>
@@ -5387,15 +5654,27 @@
 				<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="658" y="631" width="120" height="14"/>
+					<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="658" y="654" width="6" height="14"/>
+					<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="655" 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">
@@ -5409,13 +5688,13 @@
 			</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="501" y="514" width="131" height="14"/>
+					<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="588" y="493" width="17" height="14"/>
+					<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="576" y="603"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_BFE6_593632EDB11F" x="576" y="488"/>
+				<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"/>
@@ -5437,24 +5716,25 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9649_6F7949D3D9BA" x="271" y="80" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9649_6F7949D3D9BA" x="249" y="69" width="135" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9649_6F7949D3D9BA" x="389" y="103" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9649_6F7949D3D9BA" x="389" y="95" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9649_6F7949D3D9BA" x="196" y="320"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9649_6F7949D3D9BA" x="196" y="98"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_9649_6F7949D3D9BA" x="408" y="98"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9649_6F7949D3D9BA" x="217" y="90"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9649_6F7949D3D9BA" x="408" y="90"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9069_38D7A3B7A01C" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_9069_38D7A3B7A01C" text="+epo:definesLotGroup" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9069_38D7A3B7A01C" x="485" y="667" width="89" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_83E6_3CAF530D5403" text="+epo:comprisesTenderAwardOutcome" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_83E6_3CAF530D5403" x="1454" y="535" width="155" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_9069_38D7A3B7A01C" text="0..*" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9069_38D7A3B7A01C" x="593" y="667" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_83E6_3CAF530D5403" text="0..*" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_83E6_3CAF530D5403" x="1436" y="564" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9069_38D7A3B7A01C" x="581" y="733"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9069_38D7A3B7A01C" x="581" y="662"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_83E6_3CAF530D5403" x="1555" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_83E6_3CAF530D5403" x="1611" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_83E6_3CAF530D5403" x="1611" y="555"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_6DEA_4e64_83E6_3CAF530D5403" x="1435" y="555"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
@@ -5468,47 +5748,61 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_9F41_FE45FA8A0605" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_9F41_FE45FA8A0605" text="+epo:describesLotCompletion" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9F41_FE45FA8A0605" x="598" y="391" width="118" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9F41_FE45FA8A0605" x="629" y="381" width="118" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_9F41_FE45FA8A0605" text="1" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9F41_FE45FA8A0605" x="633" y="408" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9F41_FE45FA8A0605" x="641" y="408" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9F41_FE45FA8A0605" x="2301" y="428"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9F41_FE45FA8A0605" x="2301" y="358"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_9F41_FE45FA8A0605" x="625" y="358"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_6DEA_4e64_9F41_FE45FA8A0605" x="625" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9F41_FE45FA8A0605" x="2254" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9F41_FE45FA8A0605" x="2254" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_9F41_FE45FA8A0605" x="633" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_6DEA_4e64_9F41_FE45FA8A0605" x="633" y="426"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_A8CB_6EBF4CDA67D5" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_A8CB_6EBF4CDA67D5" text="+epo:comprisesTender" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="951" y="523" width="92" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="945" y="523" width="92" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_A8CB_6EBF4CDA67D5" text="1..*" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="1009" y="505" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="1003" y="505" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="997" y="603"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A8CB_6EBF4CDA67D5" x="997" y="500"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A8CB_6EBF4CDA67D5" x="991" y="603"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A8CB_6EBF4CDA67D5" x="991" y="500"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_B11C_CBD651205C58" text="+epo:comprisesAwardOutcome" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_B11C_CBD651205C58" x="1427" y="164" width="127" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_B11C_CBD651205C58" text="0..*" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_B11C_CBD651205C58" x="1493" y="179" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_B11C_CBD651205C58" x="1485" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_B11C_CBD651205C58" x="1485" y="193"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_94BC_1C90816E0487" x="540" y="391" width="71" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_94BC_1C90816E0487" x="541" y="376" width="71" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_94BC_1C90816E0487" x="585" y="409" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_94BC_1C90816E0487" x="588" y="409" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_94BC_1C90816E0487" x="1257" y="326"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_94BC_1C90816E0487" x="575" y="326"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_94BC_1C90816E0487" x="575" y="426"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_94BC_1C90816E0487" x="1242" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_94BC_1C90816E0487" x="578" y="313"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_94BC_1C90816E0487" x="578" y="426"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_8EBE_A60BD8ED070A" x="1472" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_8EBE_A60BD8ED070A" x="1472" y="236"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_9C45_B9A2F9CBFE43" text="+epo:concernsTender" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1083" y="471" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1091" y="465" width="87" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_9C45_B9A2F9CBFE43" text="1" modelElement="EAID_dst497249_92E0_435e_9C45_B9A2F9CBFE43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1072" y="493" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1072" y="487" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1283" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9C45_B9A2F9CBFE43" x="1283" y="488"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_9C45_B9A2F9CBFE43" x="1069" y="488"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_9C45_B9A2F9CBFE43" x="1347" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_9C45_B9A2F9CBFE43" x="1347" y="482"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_9C45_B9A2F9CBFE43" x="1069" y="482"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -5517,124 +5811,41 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_8F66_FA023FA190E7" x="454" y="493" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_8F66_FA023FA190E7" x="1785" y="507"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_8F66_FA023FA190E7" x="1785" y="705"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_8F66_FA023FA190E7" x="1824" y="496"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_8F66_FA023FA190E7" x="1824" y="705"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_8F66_FA023FA190E7" x="442" y="705"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_6DEA_4e64_8F66_FA023FA190E7" x="442" y="488"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A5D7_18A876BF10CF" x="1095" y="443" width="84" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_A5D7_18A876BF10CF" x="1087" y="430" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A5D7_18A876BF10CF" x="1076" y="419" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_A5D7_18A876BF10CF" x="1075" y="455" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A5D7_18A876BF10CF" x="1682" y="437"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A5D7_18A876BF10CF" x="1069" y="437"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_A5D7_18A876BF10CF" x="1721" y="446"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_A5D7_18A876BF10CF" x="1069" y="446"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_8F53_7F49CAD18053" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_6DEA_4e64_8F53_7F49CAD18053" text="+epo:refersToContract" modelElement="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_8F53_7F49CAD18053" x="1905" y="444" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_8F53_7F49CAD18053" x="1944" y="433" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_8F53_7F49CAD18053" text="1" modelElement="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_8F53_7F49CAD18053" x="1901" y="470" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_8F53_7F49CAD18053" x="1940" y="459" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_8F53_7F49CAD18053" x="2105" y="465"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_8F53_7F49CAD18053" x="1898" y="465"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_8F53_7F49CAD18053" x="2105" y="454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_8F53_7F49CAD18053" x="1937" y="454"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BE36C015_6DEA_4e64_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_6DEA_4e64_B61D_661F42799A98" text="+epo:isSubjectToGrouping" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_B61D_661F42799A98" x="672" y="593" width="105" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DEA_4e64_B61D_661F42799A98" x="682" y="593" width="105" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DEA_4e64_B61D_661F42799A98" text="0..1" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_B61D_661F42799A98" x="658" y="616" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DEA_4e64_B61D_661F42799A98" x="668" y="616" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DEA_4e64_B61D_661F42799A98" x="877" y="500"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DEA_4e64_B61D_661F42799A98" x="877" y="611"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DEA_4e64_B61D_661F42799A98" x="655" y="611"/>
-			</ownedElement>
-		</umldi:Diagram>
-		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_8187914A_C8B4_4cd2_BE0C_83AFEE8CC0B5" isFrame="false" modelElement="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0">
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_AAF2_9B8BD55CD496" modelElement="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_AAF2_9B8BD55CD496" text="epo:Prize"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_AAF2_9B8BD55CD496" x="758" y="402" width="178" height="46"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_9B44_2FCDD6AB5C9D" x="714" y="229" width="267" height="100"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_AC62_FA4769B4D88C" x="70" y="251" width="112" height="55"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_835A_24C87816F40C" x="369" y="376" width="261" height="98"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_80B0_0C345D6703F4" x="361" y="225" width="278" height="106"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_BAA8_68D1BF528FF5" x="384" y="25" width="232" height="137"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_8187914A_C8B4_4cd2_BCD0_09D751D046C7" modelElement="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C8B4_4cd2_BCD0_09D751D046C7" text="epo:ProcurementElement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C8B4_4cd2_BCD0_09D751D046C7" x="770" y="58" width="171" height="70"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_A495_71F8920238AD" source="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C8B4_4cd2_A495_71F8920238AD" text="+epo:hasPrizeValue" modelElement="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C8B4_4cd2_A495_71F8920238AD" x="797" y="353" width="80" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C8B4_4cd2_A495_71F8920238AD" text="0..1" modelElement="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C8B4_4cd2_A495_71F8920238AD" x="859" y="334" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C8B4_4cd2_A495_71F8920238AD" x="847" y="402"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_A495_71F8920238AD" x="847" y="329"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_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_C8B4_4cd2_9F54_76A56333BE1E" text="+epo:definesPrize" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C8B4_4cd2_9F54_76A56333BE1E" x="682" y="395" width="72" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C8B4_4cd2_9F54_76A56333BE1E" text="0..*" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C8B4_4cd2_9F54_76A56333BE1E" x="720" y="430" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C8B4_4cd2_9F54_76A56333BE1E" x="630" y="423"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_9F54_76A56333BE1E" x="758" y="423"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_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_C8B4_4cd2_ADCE_908A980E0342" x="125" y="251"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_ADCE_908A980E0342" x="125" y="94"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_C8B4_4cd2_ADCE_908A980E0342" x="384" y="94"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_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_C8B4_4cd2_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C8B4_4cd2_9195_C96F98BD3349" x="186" y="258" width="171" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C8B4_4cd2_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C8B4_4cd2_9195_C96F98BD3349" x="185" y="283" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C8B4_4cd2_9195_C96F98BD3349" x="361" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_9195_C96F98BD3349" x="182" y="278"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_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_C8B4_4cd2_A8A7_C0037581B6D3" x="497" y="225"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_A8A7_C0037581B6D3" x="497" y="162"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_9C87_1543CFCC17D9" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_C8B4_4cd2_9C87_1543CFCC17D9" text="+epo:hasEstimatedValue" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_C8B4_4cd2_9C87_1543CFCC17D9" x="804" y="188" width="101" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_C8B4_4cd2_9C87_1543CFCC17D9" text="0..1" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_C8B4_4cd2_9C87_1543CFCC17D9" x="861" y="211" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C8B4_4cd2_9C87_1543CFCC17D9" x="853" y="128"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_9C87_1543CFCC17D9" x="853" y="229"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_8187914A_C8B4_4cd2_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_C8B4_4cd2_A1C6_F384FEC304AE" x="616" y="93"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C8B4_4cd2_A1C6_F384FEC304AE" x="770" y="93"/>
+				<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_4BA59459_2BE8_4a2a_9BD6_72CB34B74A87" isFrame="false" modelElement="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0">
@@ -5644,7 +5855,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="179" y="401" width="220" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_B152_611B940C8A5E" x="245" y="401" width="220" height="85"/>
 			</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"/>
@@ -5660,65 +5871,107 @@
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_BAA8_68D1BF528FF5" x="161" y="54" width="232" height="137"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_BAA8_68D1BF528FF5" x="50" y="54" width="244" height="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_9848_ECC8B70AFE82" modelElement="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_2BE8_4a2a_9848_ECC8B70AFE82" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_9848_ECC8B70AFE82" text="at-voc:applicability"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_9848_ECC8B70AFE82" x="28" y="368" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_9848_ECC8B70AFE82" x="99" y="341" width="90" height="60"/>
 			</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="564" y="172" width="102" height="14"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_AAF2_9B8BD55CD496" modelElement="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_AAF2_9B8BD55CD496" text="epo:Prize"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_AAF2_9B8BD55CD496" x="1338" y="401" width="178" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_BCD0_09D751D046C7" modelElement="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_BCD0_09D751D046C7" text="epo:ProcurementElement"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_BCD0_09D751D046C7" x="1058" y="34" width="171" height="70"/>
+			</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="689" width="171" 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"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_835A_24C87816F40C" x="1297" y="211" width="261" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_AC62_FA4769B4D88C" text="epo:Lot"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_AC62_FA4769B4D88C" x="1088" y="820" width="112" height="55"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_80B0_0C345D6703F4" text="epo:Procedure"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_80B0_0C345D6703F4" x="480" y="889" width="278" height="106"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4BA59459_2BE8_4a2a_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2BE8_4a2a_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2BE8_4a2a_A53A_502157F5F45A" x="1293" y="34" width="110" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9C87_1543CFCC17D9" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9C87_1543CFCC17D9" text="+epo:hasEstimatedValue" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9C87_1543CFCC17D9" x="1092" y="169" width="101" 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="624" y="192" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9C87_1543CFCC17D9" text="0..1" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9C87_1543CFCC17D9" x="1149" y="192" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_B54C_5FBB7973D2FA" x="393" y="123"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_B54C_5FBB7973D2FA" x="616" y="123"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_B54C_5FBB7973D2FA" x="616" y="210"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9C87_1543CFCC17D9" x="1141" y="104"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9C87_1543CFCC17D9" x="1141" y="210"/>
 			</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"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_919E_87DD36154F85" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" modelElement="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_919E_87DD36154F85" text="+epo:foreseesConcession" modelElement="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_919E_87DD36154F85" x="404" y="236" width="102" 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"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_919E_87DD36154F85" text="0..1" modelElement="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_919E_87DD36154F85" x="489" y="259" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A52E_6EBA9F23871A" x="399" 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_919E_87DD36154F85" x="399" y="254"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_919E_87DD36154F85" x="508" y="254"/>
 			</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">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_86E7_B4E433F87208" x="1041" y="502" width="155" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A489_DFE2AC9F7B9B" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" modelElement="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A489_DFE2AC9F7B9B" x="180" y="251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A489_DFE2AC9F7B9B" x="145" y="251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_A489_DFE2AC9F7B9B" x="145" y="341"/>
+			</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"/>
 				</ownedElement>
-				<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="1130" y="461" width="17" height="14"/>
+				<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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_86E7_B4E433F87208" x="747" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_86E7_B4E433F87208" x="1118" y="616"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_86E7_B4E433F87208" x="1118" y="456"/>
+				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_94D7_26E6E451AF0C" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_94D7_26E6E451AF0C" text="+epo:hasLowestReceivedTenderValue" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_94D7_26E6E451AF0C" x="892" y="480" width="153" height="14"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_B61D_661F42799A98" x="939" y="719" width="105" height="14"/>
 				</ownedElement>
-				<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="981" y="461" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_B61D_661F42799A98" text="0..1" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_B61D_661F42799A98" x="1039" y="742" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_94D7_26E6E451AF0C" x="747" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_94D7_26E6E451AF0C" x="969" y="572"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_94D7_26E6E451AF0C" x="969" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_B61D_661F42799A98" x="235" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_B61D_661F42799A98" x="235" y="737"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_B61D_661F42799A98" x="1058" y="737"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A13E_A5E9A66D9379" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_A13E_A5E9A66D9379" text="+epo:hasConcessionEstimatedValue" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_A13E_A5E9A66D9379" x="755" y="244" width="122" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9B16_DD484C6E2547" x="968" y="810" width="96" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_A13E_A5E9A66D9379" text="0..1" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_A13E_A5E9A66D9379" x="902" y="277" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9B16_DD484C6E2547" text="1" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9B16_DD484C6E2547" x="1080" y="837" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A13E_A5E9A66D9379" x="728" y="272"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A13E_A5E9A66D9379" x="921" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9B16_DD484C6E2547" x="201" y="293"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9B16_DD484C6E2547" x="201" y="832"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_9B16_DD484C6E2547" x="1088" y="832"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_BA4A_4553057B7C23" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_BA4A_4553057B7C23" text="+epo:hasEstimatedBuyerConcessionRevenue" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_BA4A_4553057B7C23" x="736" y="279" width="157" height="27"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_BA4A_4553057B7C23" text="0..1" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_BA4A_4553057B7C23" x="904" y="320" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_BA4A_4553057B7C23" x="728" y="310"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_BA4A_4553057B7C23" x="921" y="310"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_8E1E_BF993F4D765A" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_8E1E_BF993F4D765A" text="+epo:hasEstimatedUserConcessionRevenue" modelElement="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A">
@@ -5730,40 +5983,37 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_8E1E_BF993F4D765A" x="728" y="243"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_8E1E_BF993F4D765A" x="921" y="243"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_BA4A_4553057B7C23" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_BA4A_4553057B7C23" text="+epo:hasEstimatedBuyerConcessionRevenue" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_BA4A_4553057B7C23" x="736" y="279" width="157" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A13E_A5E9A66D9379" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_A13E_A5E9A66D9379" text="+epo:hasConcessionEstimatedValue" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_A13E_A5E9A66D9379" x="755" y="244" width="122" height="27"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_BA4A_4553057B7C23" text="0..1" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_BA4A_4553057B7C23" x="904" y="320" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_A13E_A5E9A66D9379" text="0..1" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_A13E_A5E9A66D9379" x="902" y="277" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_BA4A_4553057B7C23" x="728" y="310"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_BA4A_4553057B7C23" x="921" y="310"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A13E_A5E9A66D9379" x="728" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A13E_A5E9A66D9379" x="921" y="272"/>
 			</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="231" y="352" width="117" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_94D7_26E6E451AF0C" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_94D7_26E6E451AF0C" text="+epo:hasLowestReceivedTenderValue" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_94D7_26E6E451AF0C" x="950" y="461" width="14" height="153"/>
 				</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="297" y="383" width="17" height="14"/>
+				<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_9CF5_2CFE5FEB856B" x="289" y="293"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9CF5_2CFE5FEB856B" x="289" y="401"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_94D7_26E6E451AF0C" x="747" 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_WP000002_2BE8_4a2a_94D7_26E6E451AF0C" x="971" y="456"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A489_DFE2AC9F7B9B" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" modelElement="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A489_DFE2AC9F7B9B" x="180" y="288"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A489_DFE2AC9F7B9B" x="71" y="288"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_A489_DFE2AC9F7B9B" x="71" y="368"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_919E_87DD36154F85" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" modelElement="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_919E_87DD36154F85" text="+epo:foreseesConcession" modelElement="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_919E_87DD36154F85" x="404" y="236" width="102" height="14"/>
+			<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">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_86E7_B4E433F87208" x="1038" y="468" width="14" height="155"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_919E_87DD36154F85" text="0..1" modelElement="EAID_dstC8CD49_71D8_4ef9_919E_87DD36154F85">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_919E_87DD36154F85" x="489" y="259" width="17" height="14"/>
+				<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_919E_87DD36154F85" x="399" y="254"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_919E_87DD36154F85" x="508" y="254"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_86E7_B4E433F87208" x="747" 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_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">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_B489_34E46CFF8E24" text="+epo:hasFinancialOfferValue" modelElement="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24">
@@ -5776,6 +6026,129 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_B489_34E46CFF8E24" x="374" y="365"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_B489_34E46CFF8E24" x="921" y="365"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_A495_71F8920238AD" source="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_A495_71F8920238AD" text="+epo:hasPrizeValue" modelElement="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_A495_71F8920238AD" x="1250" y="410" width="80" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_A495_71F8920238AD" text="0..1" modelElement="EAID_dstC0DED2_0415_4ef8_A495_71F8920238AD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_A495_71F8920238AD" x="1232" y="428" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_A495_71F8920238AD" x="1338" y="423"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A495_71F8920238AD" x="1229" y="423"/>
+			</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"/>
+				</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"/>
+				</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"/>
+			</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"/>
+				</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"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9E66_5EBEFD7759BC" x="1207" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9E66_5EBEFD7759BC" x="1207" 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"/>
+				</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"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_8F62_2FA41A99DF74" x="1130" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_8F62_2FA41A99DF74" x="1130" 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="1084" y="776" 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"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_BFE6_593632EDB11F" x="1145" y="759"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_BFE6_593632EDB11F" x="1145" 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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9F54_76A56333BE1E" x="1396" y="355" width="72" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9F54_76A56333BE1E" text="0..*" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9F54_76A56333BE1E" x="1440" y="386" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9F54_76A56333BE1E" x="1428" y="335"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9F54_76A56333BE1E" x="1428" y="401"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_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_2BE8_4a2a_ADCE_908A980E0342" x="1088" y="863"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_ADCE_908A980E0342" x="93" y="863"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_ADCE_908A980E0342" x="93" y="191"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_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_2BE8_4a2a_A8A7_C0037581B6D3" x="480" y="946"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A8A7_C0037581B6D3" x="64" y="946"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_A8A7_C0037581B6D3" x="64" y="191"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_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_2BE8_4a2a_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9195_C96F98BD3349" x="1054" y="900" width="171" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9195_C96F98BD3349" x="1161" y="880" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9195_C96F98BD3349" x="758" y="947"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9195_C96F98BD3349" x="1149" y="947"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_9195_C96F98BD3349" x="1149" y="875"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_9649_6F7949D3D9BA" x="121" y="20" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_9649_6F7949D3D9BA" x="202" y="36" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_9649_6F7949D3D9BA" x="1347" y="34"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9649_6F7949D3D9BA" x="1347" y="16"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_9649_6F7949D3D9BA" x="194" y="16"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_2BE8_4a2a_9649_6F7949D3D9BA" x="194" y="54"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_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_2BE8_4a2a_9664_258E887283AF" x="1293" y="69"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_9664_258E887283AF" x="1229" y="69"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2BE8_4a2a_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2BE8_4a2a_AD37_79213AD539C8" x="851" y="167" width="221" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2BE8_4a2a_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2BE8_4a2a_AD37_79213AD539C8" x="977" y="192" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2BE8_4a2a_AD37_79213AD539C8" x="294" y="136"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_AD37_79213AD539C8" x="969" y="136"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2BE8_4a2a_AD37_79213AD539C8" x="969" y="210"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4BA59459_2BE8_4a2a_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_2BE8_4a2a_A1C6_F384FEC304AE" x="294" y="74"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2BE8_4a2a_A1C6_F384FEC304AE" x="1058" y="74"/>
+			</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"/>
+				</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"/>
+				</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"/>
+			</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">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
@@ -5788,11 +6161,11 @@
 			</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="130" y="330" width="158" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_BF42_2A6E50CAF4E6" x="124" y="330" width="171" height="62"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_AC62_FA4769B4D88C" x="739" y="677" width="145" height="49"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_AC62_FA4769B4D88C" x="739" y="628" width="145" height="49"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
@@ -5800,18 +6173,18 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_8372_75A07B6AB066" x="1019" y="652" width="219" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_8372_75A07B6AB066" x="1019" y="603" width="219" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_B8D8_207479C15419" x="1339" y="665" width="224" height="72"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_B8D8_207479C15419" x="1339" y="616" width="224" height="72"/>
 			</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"/>
 			</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="502" y="376" width="119" height="43"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_B90C_6DEFC3C6D8BB" x="250" y="252" 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"/>
@@ -5819,21 +6192,25 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_AD48_245A5F11A4D5" modelElement="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_AD48_245A5F11A4D5" text="epo:MiniCompetitionAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_AD48_245A5F11A4D5" x="346" y="606" width="134" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_AD48_245A5F11A4D5" x="353" y="606" width="134" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_BE33_620A29646687" text="epo:AwardOutcome"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_BE33_620A29646687" x="368" y="456" width="103" height="70"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_94BC_1C90816E0487" x="784" y="641" width="71" height="14"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_147ECFF1_21DD_4c94_BE40_C921C05C776E" modelElement="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_21DD_4c94_BE40_C921C05C776E" text="epo:TenderGroup"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_21DD_4c94_BE40_C921C05C776E" x="1365" y="456" width="171" height="70"/>
+			</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"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_94BC_1C90816E0487" x="824" y="660" width="6" height="14"/>
+				<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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_94BC_1C90816E0487" x="814" y="551"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_94BC_1C90816E0487" x="814" y="677"/>
+				<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"/>
 			</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">
@@ -5907,6 +6284,16 @@
 				<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"/>
 			</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"/>
+				</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"/>
+				</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"/>
+			</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"/>
@@ -5917,86 +6304,88 @@
 				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_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_21DD_4c94_9BBA_3C0E1D4E25A8" x="408" y="606"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9BBA_3C0E1D4E25A8" x="411" y="526"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_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_21DD_4c94_8EBE_A60BD8ED070A" x="675" y="491"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8EBE_A60BD8ED070A" x="471" y="491"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_910B_A28B233CEB46" x="1009" y="156" width="137" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_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_21DD_4c94_9BBA_3C0E1D4E25A8" x="421" y="606"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9BBA_3C0E1D4E25A8" x="421" y="526"/>
+			</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"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_910B_A28B233CEB46" x="1000" y="179" width="17" height="14"/>
+				<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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_910B_A28B233CEB46" x="948" y="527"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_910B_A28B233CEB46" x="1105" y="527"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_910B_A28B233CEB46" x="1105" y="174"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_21DD_4c94_910B_A28B233CEB46" x="997" y="174"/>
+				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_8978_7B6F899FD855" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_8978_7B6F899FD855" text="+epo:hasFrameworkAgreementEstimatedValue" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8978_7B6F899FD855" x="836" y="322" width="192" height="14"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A283_8978FB00BD51" x="2" y="343" width="120" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_8978_7B6F899FD855" text="0..1" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8978_7B6F899FD855" x="941" y="275" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A283_8978FB00BD51" text="1" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A283_8978FB00BD51" x="116" y="366" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8978_7B6F899FD855" x="929" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8978_7B6F899FD855" x="929" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A283_8978FB00BD51" x="1481" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A283_8978FB00BD51" x="1481" y="33"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_A283_8978FB00BD51" x="31" y="33"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_21DD_4c94_A283_8978FB00BD51" x="31" y="361"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_21DD_4c94_A283_8978FB00BD51" x="124" y="361"/>
 			</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="729" y="350" width="193" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A8CB_6EBF4CDA67D5" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A8CB_6EBF4CDA67D5" text="+epo:comprisesTender" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A8CB_6EBF4CDA67D5" x="1412" y="572" width="92" 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="828" y="275" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A8CB_6EBF4CDA67D5" text="1..*" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A8CB_6EBF4CDA67D5" x="1458" y="598" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8D8A_71BD69D25161" x="816" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8D8A_71BD69D25161" x="816" y="270"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A8CB_6EBF4CDA67D5" x="1450" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A8CB_6EBF4CDA67D5" x="1450" y="616"/>
 			</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="594" y="318" width="203" height="14"/>
+			<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"/>
 				</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="715" y="275" width="17" height="14"/>
+				<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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A6DC_62DFC84C122D" x="703" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A6DC_62DFC84C122D" x="703" y="270"/>
+				<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"/>
 			</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="118" width="94" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_9953_EA1E6D255A89" x="1017" y="117" 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="138" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_9953_EA1E6D255A89" x="1000" y="137" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_9953_EA1E6D255A89" x="1157" y="652"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_9953_EA1E6D255A89" x="1157" y="133"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_21DD_4c94_9953_EA1E6D255A89" x="997" y="133"/>
+				<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"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8F66_FA023FA190E7" x="900" y="682" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_8F66_FA023FA190E7" x="900" y="633" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8F66_FA023FA190E7" x="887" y="706" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_8F66_FA023FA190E7" x="887" y="657" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8F66_FA023FA190E7" x="1019" y="701"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8F66_FA023FA190E7" x="884" y="701"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_8F66_FA023FA190E7" x="1019" y="652"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_8F66_FA023FA190E7" x="884" y="652"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_21DD_4c94_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A5D7_18A876BF10CF" x="1240" y="681" width="84" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_A5D7_18A876BF10CF" x="1240" y="632" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A5D7_18A876BF10CF" x="1320" y="706" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_A5D7_18A876BF10CF" x="1320" y="657" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A5D7_18A876BF10CF" x="1238" y="701"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A5D7_18A876BF10CF" x="1339" y="701"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_21DD_4c94_A5D7_18A876BF10CF" x="1238" y="652"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_A5D7_18A876BF10CF" x="1339" y="652"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_147ECFF1_21DD_4c94_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_21DD_4c94_B11C_CBD651205C58" text="+epo:comprisesAwardOutcome" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
@@ -6009,215 +6398,225 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_B11C_CBD651205C58" x="164" y="497"/>
 				<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_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"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_21DD_4c94_94BC_1C90816E0487" x="784" y="592" width="71" 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"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_21DD_4c94_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_21DD_4c94_94BC_1C90816E0487" x="824" y="611" width="6" 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_94BC_1C90816E0487" x="814" y="551"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_21DD_4c94_94BC_1C90816E0487" x="814" y="628"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_A2669D8B_ED55_4aef_B387_F43B34E94682" isFrame="false" modelElement="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_9B44_2FCDD6AB5C9D" x="507" y="675" width="267" height="106"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_9B44_2FCDD6AB5C9D" x="664" y="742" width="267" height="106"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_AC62_FA4769B4D88C" x="80" y="76" width="249" height="128"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_AC62_FA4769B4D88C" x="237" y="143" width="249" height="128"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_B2BD_3FD3B49365EE" modelElement="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_B2BD_3FD3B49365EE" text="epo:ContractLotCompletionInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B2BD_3FD3B49365EE" x="832" y="237" width="294" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B2BD_3FD3B49365EE" x="989" y="304" width="294" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_A416_3E77939F9B7A" x="512" y="374" width="258" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_A416_3E77939F9B7A" x="669" y="441" width="258" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_8372_75A07B6AB066" x="398" y="217" width="219" height="111"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_8372_75A07B6AB066" x="555" y="284" width="219" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B8D8_207479C15419" x="92" y="349" width="224" height="72"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B8D8_207479C15419" x="249" y="416" width="224" height="72"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_BEC9_90381AD6D4F1" modelElement="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_BEC9_90381AD6D4F1" text="epo:ReviewObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_BEC9_90381AD6D4F1" x="102" y="530" width="203" height="76"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_BEC9_90381AD6D4F1" x="4" y="745" width="203" height="76"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_B59A_3107FF9B30BC" modelElement="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_B59A_3107FF9B30BC" text="epo:ReviewRequest"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B59A_3107FF9B30BC" x="84" y="678" width="238" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_B59A_3107FF9B30BC" x="241" y="745" width="238" height="101"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A2669D8B_ED55_4aef_95C9_B8B685B22E32" modelElement="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_ED55_4aef_95C9_B8B685B22E32" text="epo:ReviewDecision"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_ED55_4aef_95C9_B8B685B22E32" x="273" y="932" width="174" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_94BC_1C90816E0487" text="+epo:concernsLot" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_94BC_1C90816E0487" x="332" y="124" width="71" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_94BC_1C90816E0487" x="489" y="191" width="71" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_94BC_1C90816E0487" x="332" y="147" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_94BC_1C90816E0487" x="489" y="214" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_94BC_1C90816E0487" x="744" y="374"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_94BC_1C90816E0487" x="744" y="142"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_94BC_1C90816E0487" x="329" y="142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_94BC_1C90816E0487" x="901" y="441"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_94BC_1C90816E0487" x="901" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_94BC_1C90816E0487" x="486" y="209"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8F66_FA023FA190E7" x="332" y="166" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8F66_FA023FA190E7" x="489" y="233" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8F66_FA023FA190E7" x="332" y="189" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8F66_FA023FA190E7" x="489" y="256" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8F66_FA023FA190E7" x="422" y="217"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8F66_FA023FA190E7" x="422" y="184"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_8F66_FA023FA190E7" x="329" y="184"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8F66_FA023FA190E7" x="579" y="284"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8F66_FA023FA190E7" x="579" y="251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_8F66_FA023FA190E7" x="486" y="251"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_A5D7_18A876BF10CF" x="225" y="303" width="84" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_A5D7_18A876BF10CF" x="382" y="370" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_A5D7_18A876BF10CF" x="237" y="328" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_A5D7_18A876BF10CF" x="394" y="395" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_A5D7_18A876BF10CF" x="398" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_A5D7_18A876BF10CF" x="263" y="278"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_A5D7_18A876BF10CF" x="263" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_A5D7_18A876BF10CF" x="555" y="345"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_A5D7_18A876BF10CF" x="420" y="345"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_A5D7_18A876BF10CF" x="420" y="416"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_8F53_7F49CAD18053" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" modelElement="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_8F53_7F49CAD18053" text="+epo:refersToContract" modelElement="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8F53_7F49CAD18053" x="620" y="253" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8F53_7F49CAD18053" x="777" y="320" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_8F53_7F49CAD18053" text="1" modelElement="EAID_dstDE37BE_E478_4159_8F53_7F49CAD18053">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8F53_7F49CAD18053" x="620" y="276" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8F53_7F49CAD18053" x="777" y="343" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8F53_7F49CAD18053" x="832" y="271"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8F53_7F49CAD18053" x="617" y="271"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8F53_7F49CAD18053" x="989" y="338"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8F53_7F49CAD18053" x="774" y="338"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_9F41_FE45FA8A0605" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_9F41_FE45FA8A0605" text="+epo:describesLotCompletion" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9F41_FE45FA8A0605" x="338" y="86" width="118" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9F41_FE45FA8A0605" x="495" y="153" width="118" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_9F41_FE45FA8A0605" text="1" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9F41_FE45FA8A0605" x="332" y="107" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9F41_FE45FA8A0605" x="489" y="174" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9F41_FE45FA8A0605" x="951" y="237"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9F41_FE45FA8A0605" x="951" y="102"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_9F41_FE45FA8A0605" x="329" y="102"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9F41_FE45FA8A0605" x="1108" y="304"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9F41_FE45FA8A0605" x="1108" y="169"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_9F41_FE45FA8A0605" x="486" y="169"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_8D4A_95B9DD217458" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_8D4A_95B9DD217458" text="+epo:providesContractTotalPaymentValue" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8D4A_95B9DD217458" x="789" y="697" width="170" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8D4A_95B9DD217458" x="946" y="764" width="170" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_8D4A_95B9DD217458" text="0..1" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8D4A_95B9DD217458" x="777" y="722" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8D4A_95B9DD217458" x="934" y="789" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8D4A_95B9DD217458" x="969" y="307"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8D4A_95B9DD217458" x="969" y="717"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_8D4A_95B9DD217458" x="774" y="717"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8D4A_95B9DD217458" x="1126" y="374"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8D4A_95B9DD217458" x="1126" y="784"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_8D4A_95B9DD217458" x="931" y="784"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_AACD_8319D1389BB9" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_AACD_8319D1389BB9" text="+epo:providesContractTotalPenaltyValue" modelElement="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_AACD_8319D1389BB9" x="793" y="743" width="164" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_AACD_8319D1389BB9" x="950" y="810" width="164" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_AACD_8319D1389BB9" text="0..1" modelElement="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_AACD_8319D1389BB9" x="777" y="764" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_AACD_8319D1389BB9" x="934" y="831" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_AACD_8319D1389BB9" x="1003" y="307"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_AACD_8319D1389BB9" x="1003" y="759"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_AACD_8319D1389BB9" x="774" y="759"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_AACD_8319D1389BB9" x="1160" y="374"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_AACD_8319D1389BB9" x="1160" y="826"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_AACD_8319D1389BB9" x="931" y="826"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_9953_EA1E6D255A89" text="+epo:hasContractValue" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9953_EA1E6D255A89" x="411" y="678" width="94" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9953_EA1E6D255A89" x="568" y="745" width="94" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_9953_EA1E6D255A89" text="0..1" modelElement="EAID_dst20FB6D_76C7_486a_9953_EA1E6D255A89">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9953_EA1E6D255A89" x="488" y="701" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9953_EA1E6D255A89" x="645" y="768" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9953_EA1E6D255A89" x="411" y="328"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9953_EA1E6D255A89" x="411" y="696"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_9953_EA1E6D255A89" x="507" y="696"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9953_EA1E6D255A89" x="568" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9953_EA1E6D255A89" x="568" y="763"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_9953_EA1E6D255A89" x="664" y="763"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9B16_DD484C6E2547" x="156" y="228" width="96" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_9B16_DD484C6E2547" x="313" y="295" width="96" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_9B16_DD484C6E2547" text="1" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9B16_DD484C6E2547" x="216" y="209" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_9B16_DD484C6E2547" x="373" y="276" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9B16_DD484C6E2547" x="204" y="349"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9B16_DD484C6E2547" x="204" y="204"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_9B16_DD484C6E2547" x="361" y="416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_9B16_DD484C6E2547" x="361" y="271"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_85E1_1ABB6B9E21EB" source="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_85E1_1ABB6B9E21EB" text="+epo:refersToPreviousReview 0..1" modelElement="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_85E1_1ABB6B9E21EB" x="190" y="481" width="138" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_85E1_1ABB6B9E21EB" x="92" y="696" width="138" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_85E1_1ABB6B9E21EB" text="0..1" modelElement="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_85E1_1ABB6B9E21EB" x="227" y="525" width="100" height="10"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_85E1_1ABB6B9E21EB" x="305" y="552"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_85E1_1ABB6B9E21EB" x="305" y="552"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_85E1_1ABB6B9E21EB" x="318" y="552"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_ED55_4aef_85E1_1ABB6B9E21EB" x="318" y="497"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_ED55_4aef_85E1_1ABB6B9E21EB" x="219" y="497"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_ED55_4aef_85E1_1ABB6B9E21EB" x="219" y="530"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_ED55_4aef_85E1_1ABB6B9E21EB" x="219" y="530"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_910B_A28B233CEB46" x="535" y="513" width="14" height="137"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_910B_A28B233CEB46" x="558" y="661" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_910B_A28B233CEB46" x="554" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_910B_A28B233CEB46" x="554" y="675"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_8978_7B6F899FD855" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_8978_7B6F899FD855" text="+epo:hasFrameworkAgreementEstimatedValue" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8978_7B6F899FD855" x="713" y="472" width="14" height="192"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_8978_7B6F899FD855" text="0..1" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8978_7B6F899FD855" x="741" y="661" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_85E1_1ABB6B9E21EB" x="129" y="740" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8978_7B6F899FD855" x="733" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8978_7B6F899FD855" x="733" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_85E1_1ABB6B9E21EB" x="207" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_85E1_1ABB6B9E21EB" x="207" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_85E1_1ABB6B9E21EB" x="220" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_ED55_4aef_85E1_1ABB6B9E21EB" x="220" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_ED55_4aef_85E1_1ABB6B9E21EB" x="121" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_ED55_4aef_85E1_1ABB6B9E21EB" x="121" y="745"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_ED55_4aef_85E1_1ABB6B9E21EB" x="121" y="745"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_8D8A_71BD69D25161" text="+epo:hasFrameworkAgreementMaximumValue" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8D8A_71BD69D25161" x="592" y="476" width="14" height="193"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_8D8A_71BD69D25161" x="749" y="543" width="14" height="193"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_8D8A_71BD69D25161" text="0..1" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8D8A_71BD69D25161" x="619" y="657" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_8D8A_71BD69D25161" x="776" y="724" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8D8A_71BD69D25161" x="611" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8D8A_71BD69D25161" x="611" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_8D8A_71BD69D25161" x="768" y="539"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_8D8A_71BD69D25161" x="768" y="742"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_A6DC_62DFC84C122D" x="664" y="471" width="14" height="203"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_A6DC_62DFC84C122D" x="821" y="538" width="14" height="203"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_A6DC_62DFC84C122D" text="0..1" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_A6DC_62DFC84C122D" x="696" y="657" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_A6DC_62DFC84C122D" x="853" y="724" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_A6DC_62DFC84C122D" x="845" y="539"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_A6DC_62DFC84C122D" x="845" y="742"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_AA0C_F4AAB1D0346B" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_AA0C_F4AAB1D0346B" x="273" y="965"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_AA0C_F4AAB1D0346B" x="99" y="965"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_AA0C_F4AAB1D0346B" x="99" y="821"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_926C_444F368462AA" text="+epo:resolvesReviewRequest" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_926C_444F368462AA" x="235" y="851" width="118" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_926C_444F368462AA" text="1" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_926C_444F368462AA" x="372" y="851" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_926C_444F368462AA" x="360" y="932"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_926C_444F368462AA" x="360" y="846"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_B7C6_33C21269E183" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_B7C6_33C21269E183" text="+epo:hasRemedyValue" modelElement="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_B7C6_33C21269E183" x="742" y="873" width="94" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_B7C6_33C21269E183" text="0..1" modelElement="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_B7C6_33C21269E183" x="807" y="853" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_A6DC_62DFC84C122D" x="688" y="472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_A6DC_62DFC84C122D" x="688" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_B7C6_33C21269E183" x="447" y="967"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_B7C6_33C21269E183" x="795" y="967"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_ED55_4aef_B7C6_33C21269E183" x="795" y="848"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_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_ED55_4aef_B8A1_C090490D5878" x="200" y="678"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_B8A1_C090490D5878" x="200" y="606"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_B8A1_C090490D5878" x="241" y="787"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_B8A1_C090490D5878" x="207" y="786"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A2669D8B_ED55_4aef_AB80_8F686D5C488E" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_ED55_4aef_AB80_8F686D5C488E" text="+epo:hasReviewRequestFee" modelElement="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_AB80_8F686D5C488E" x="377" y="726" width="114" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_ED55_4aef_AB80_8F686D5C488E" x="534" y="793" width="114" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_ED55_4aef_AB80_8F686D5C488E" text="0..1" modelElement="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_AB80_8F686D5C488E" x="488" y="750" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_ED55_4aef_AB80_8F686D5C488E" x="645" y="817" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_AB80_8F686D5C488E" x="322" y="745"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_AB80_8F686D5C488E" x="507" y="745"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_ED55_4aef_AB80_8F686D5C488E" x="479" y="812"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_ED55_4aef_AB80_8F686D5C488E" x="664" y="812"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_605C4B64_024F_408a_995E_857FCDBE5F93" isFrame="false" modelElement="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72">
@@ -6242,10 +6641,6 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_024F_408a_A306_7FCBDE0E5A37" text="at-voc:procurement-procedure-type"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_024F_408a_A306_7FCBDE0E5A37" x="890" y="654" width="135" height="57"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_605C4B64_024F_408a_A935_11584ADDCE8B" modelElement="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_024F_408a_A935_11584ADDCE8B" text="epo-not:PlanningNotice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_024F_408a_A935_11584ADDCE8B" x="83" y="323" width="123" height="60"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_605C4B64_024F_408a_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_024F_408a_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_024F_408a_A53A_502157F5F45A" x="407" y="298" width="282" height="85"/>
@@ -6284,18 +6679,19 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_024F_408a_BCD0_09D751D046C7" text="epo:ProcurementElement"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_024F_408a_BCD0_09D751D046C7" x="872" y="175" width="171" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_605C4B64_024F_408a_BA2A_4BE70960E4FB" modelElement="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_024F_408a_BA2A_4BE70960E4FB" x="87" y="456" width="115" height="67"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_9647_0E2E150D7463" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_9647_0E2E150D7463" text="+epo:hasPlannedDuration" modelElement="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_9647_0E2E150D7463" x="384" y="255" width="104" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_8ECC_D32EF06886BB" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_8ECC_D32EF06886BB" text="+epo:hasPlannedPeriod" modelElement="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_8ECC_D32EF06886BB" x="527" y="233" width="95" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_9647_0E2E150D7463" text="0..1" modelElement="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_9647_0E2E150D7463" x="449" y="230" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_8ECC_D32EF06886BB" text="0..1" modelElement="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_8ECC_D32EF06886BB" x="589" y="205" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9647_0E2E150D7463" x="440" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9647_0E2E150D7463" x="440" y="219"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_8ECC_D32EF06886BB" x="577" y="298"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_8ECC_D32EF06886BB" x="577" y="200"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_A1C6_F384FEC304AE" x="957" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_A1C6_F384FEC304AE" x="957" y="245"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_9C87_1543CFCC17D9" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_9C87_1543CFCC17D9" text="+epo:hasEstimatedValue" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
@@ -6307,10 +6703,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9C87_1543CFCC17D9" x="1043" y="212"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9C87_1543CFCC17D9" x="1175" y="212"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_B841_73C5D3CD3B56" source="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" target="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" modelElement="EAID_A663CF6F_0B0E_47fa_B841_73C5D3CD3B56">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_B841_73C5D3CD3B56" x="202" y="467"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_B841_73C5D3CD3B56" x="431" y="383"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_B8D7_2BC14F331BE5" x="598" y="142"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_B8D7_2BC14F331BE5" x="598" y="97"/>
@@ -6323,33 +6715,46 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_AA82_ECF06C845021" x="245" y="164"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_AA82_ECF06C845021" x="380" y="164"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_AFC8_89D40A9529FD" x="245" y="209"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_AFC8_89D40A9529FD" x="380" y="209"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_AD37_79213AD539C8" x="1199" y="297" width="221" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_AD37_79213AD539C8" x="1327" y="264" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_AD37_79213AD539C8" x="1073" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_AD37_79213AD539C8" x="1315" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_024F_408a_AD37_79213AD539C8" x="1315" y="259"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_A1C6_F384FEC304AE" x="957" y="272"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_A1C6_F384FEC304AE" x="957" y="245"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_9649_6F7949D3D9BA" x="704" y="322" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_9649_6F7949D3D9BA" x="822" y="345" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9649_6F7949D3D9BA" x="689" y="340"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9649_6F7949D3D9BA" x="841" y="340"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_8ECC_D32EF06886BB" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_8ECC_D32EF06886BB" text="+epo:hasPlannedPeriod" modelElement="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_8ECC_D32EF06886BB" x="527" y="233" width="95" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_83A7_6E582F53DA90" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" modelElement="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_83A7_6E582F53DA90" text="+epo:refersToPlannedPart" modelElement="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_83A7_6E582F53DA90" x="491" y="415" width="105" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_8ECC_D32EF06886BB" text="0..1" modelElement="EAID_dst7EAC2F_A434_424a_8ECC_D32EF06886BB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_8ECC_D32EF06886BB" x="589" y="205" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_83A7_6E582F53DA90" text="0..*" modelElement="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_83A7_6E582F53DA90" x="559" y="388" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_8ECC_D32EF06886BB" x="577" y="298"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_8ECC_D32EF06886BB" x="577" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_83A7_6E582F53DA90" x="547" y="445"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_83A7_6E582F53DA90" x="547" y="383"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_ACA1_C8D3B87F7C00" source="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" target="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" modelElement="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_ACA1_C8D3B87F7C00" text="+epo:announcesPlannedProcurementPart" modelElement="EAID_dst3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_ACA1_C8D3B87F7C00" x="233" y="334" width="166" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_9647_0E2E150D7463" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_9647_0E2E150D7463" text="+epo:hasPlannedDuration" modelElement="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_9647_0E2E150D7463" x="384" y="255" width="104" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_ACA1_C8D3B87F7C00" text="0..*" modelElement="EAID_dst3E83F2_4A0C_4707_ACA1_C8D3B87F7C00">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_ACA1_C8D3B87F7C00" x="388" y="358" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_9647_0E2E150D7463" text="0..1" modelElement="EAID_dst2AC560_378D_4c18_9647_0E2E150D7463">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_9647_0E2E150D7463" x="449" y="230" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_ACA1_C8D3B87F7C00" x="206" y="353"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_ACA1_C8D3B87F7C00" x="407" y="353"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9647_0E2E150D7463" x="440" y="298"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9647_0E2E150D7463" x="440" y="219"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_9664_258E887283AF" x="652" y="298"/>
@@ -6379,25 +6784,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9195_C96F98BD3349" x="1100" y="524"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9195_C96F98BD3349" x="1278" y="524"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_83A7_6E582F53DA90" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" modelElement="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_83A7_6E582F53DA90" text="+epo:refersToPlannedPart" modelElement="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_83A7_6E582F53DA90" x="491" y="415" width="105" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_83A7_6E582F53DA90" text="0..*" modelElement="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_83A7_6E582F53DA90" x="559" y="388" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_83A7_6E582F53DA90" x="547" y="445"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_83A7_6E582F53DA90" x="547" y="383"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_024F_408a_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_024F_408a_9649_6F7949D3D9BA" x="704" y="322" width="135" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_024F_408a_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_024F_408a_9649_6F7949D3D9BA" x="822" y="345" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_024F_408a_9649_6F7949D3D9BA" x="689" y="340"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_9649_6F7949D3D9BA" x="841" y="340"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_605C4B64_024F_408a_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_024F_408a_AFC8_89D40A9529FD" x="245" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_024F_408a_AFC8_89D40A9529FD" x="380" y="209"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_4FF9AAC8_5E59_49bd_A037_CBB07F6B2BA8" isFrame="false" modelElement="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72">
@@ -6408,15 +6797,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_81DD_DA4802D8A322" text="org:Organization"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_81DD_DA4802D8A322" x="2534" y="1491" width="253" height="124"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_81DD_DA4802D8A322" x="2534" y="1609" width="253" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_B54C_B6CDF1726225" modelElement="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_B54C_B6CDF1726225" text="cpv:Person"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B54C_B6CDF1726225" x="1781" y="1469" width="209" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B54C_B6CDF1726225" x="1781" y="1587" width="209" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_B10A_658AA61F3CAD" modelElement="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_B10A_658AA61F3CAD" text="epo:DirectAwardTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B10A_658AA61F3CAD" x="1341" y="1168" width="191" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B10A_658AA61F3CAD" x="1341" y="1251" width="191" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
@@ -6424,23 +6813,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_9B44_2FCDD6AB5C9D" x="283" y="1423" width="411" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_9B44_2FCDD6AB5C9D" x="2293" y="960" width="411" height="101"/>
 			</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="1989" y="797" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BF42_2A6E50CAF4E6" x="1980" y="783" width="172" 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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B53F_E7A5B530FFFD" x="1119" y="1027" width="122" height="96"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B53F_E7A5B530FFFD" x="1119" y="1094" width="121" height="112"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_BA47_E78DE21C76DE" modelElement="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_BA47_E78DE21C76DE" text="locn:Geometry"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BA47_E78DE21C76DE" x="2469" y="1021" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BA47_E78DE21C76DE" x="2469" y="1151" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_BE84_76269B5BBD68" modelElement="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_BE84_76269B5BBD68" text="locn:Address"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BE84_76269B5BBD68" x="2093" y="1474" width="202" height="153"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_BE84_76269B5BBD68" x="2093" y="1592" width="202" height="153"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -6448,7 +6837,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_A129_C30771A9833F" modelElement="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_A129_C30771A9833F" text="cpov:ContactPoint"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A129_C30771A9833F" x="2553" y="1689" width="197" height="127"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A129_C30771A9833F" x="2553" y="1807" width="197" height="127"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_9E5F_29ED464CE561" modelElement="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_9E5F_29ED464CE561" text="epo:SubcontractTerm"/>
@@ -6468,16 +6857,16 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_B611_0048946DC070" modelElement="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_B611_0048946DC070" text="epo:ProcurementServiceProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B611_0048946DC070" x="962" y="1405" width="126" height="66"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B611_0048946DC070" x="962" y="1514" width="126" height="66"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_988F_5C88024446CE" modelElement="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_988F_5C88024446CE" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_988F_5C88024446CE" text="at-voc:buyer-legal-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_988F_5C88024446CE" x="2530" y="1336" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_988F_5C88024446CE" x="2530" y="1428" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_80A4_32F092496FEF" modelElement="EAID_70B4792E_F818_45db_80A4_32F092496FEF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_80A4_32F092496FEF" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_80A4_32F092496FEF" x="1628" y="1409" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_80A4_32F092496FEF" x="1628" y="1518" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_8108_0018817C75BD" modelElement="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_8108_0018817C75BD" text="epo:OpeningTerm"/>
@@ -6485,38 +6874,38 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_80B0_0C345D6703F4" x="1577" y="1012" width="287" height="163"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_80B0_0C345D6703F4" x="1577" y="1095" width="287" height="163"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_A084_E51BAA1CF00D" modelElement="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_A084_E51BAA1CF00D" text="epo:ProcedureTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A084_E51BAA1CF00D" x="868" y="1168" width="287" height="179"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A084_E51BAA1CF00D" x="868" y="1251" width="287" height="179"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_9655_04521F703750" text="epo:Buyer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_9655_04521F703750" x="1254" y="1381" width="228" height="91"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_9655_04521F703750" x="1254" y="1490" width="228" height="91"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_B823_3C4BB4A7AE6C" modelElement="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_B823_3C4BB4A7AE6C" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B823_3C4BB4A7AE6C" x="1729" y="1296" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_B823_3C4BB4A7AE6C" x="1729" y="1379" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_97BB_07EBCE11D45C" modelElement="EAID_A312F200_1050_451d_97BB_07EBCE11D45C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_97BB_07EBCE11D45C" text="epo:Mediator"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_97BB_07EBCE11D45C" x="794" y="1403" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_97BB_07EBCE11D45C" x="794" y="1512" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_A683_B6FC29EE98CC" modelElement="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_A683_B6FC29EE98CC" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_A683_B6FC29EE98CC" text="at-voc:main-activity"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A683_B6FC29EE98CC" x="2678" y="1336" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_A683_B6FC29EE98CC" x="2678" y="1428" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_8FE5_C4EE73295C40" modelElement="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_8FE5_C4EE73295C40" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_8FE5_C4EE73295C40" text="at-voc:nuts"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_8FE5_C4EE73295C40" x="2355" y="1348" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_8FE5_C4EE73295C40" x="2355" y="1440" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_ABBB_CBDD98065B7F" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_ABBB_CBDD98065B7F" text="at-voc:country"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_ABBB_CBDD98065B7F" x="1990" y="1314" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_ABBB_CBDD98065B7F" x="1990" y="1406" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_9A9B_C25371C94006" modelElement="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_9A9B_C25371C94006" text="enumeration"/>
@@ -6533,7 +6922,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_96AB_8417E2069155" modelElement="EAID_FA070646_D88B_493f_96AB_8417E2069155">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5E59_49bd_96AB_8417E2069155" text="epo:FrameworkAgreementTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_96AB_8417E2069155" x="343" y="1224" width="291" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5E59_49bd_96AB_8417E2069155" x="343" y="1307" width="291" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_9848_ECC8B70AFE82" modelElement="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5E59_49bd_9848_ECC8B70AFE82" text="enumeration"/>
@@ -6550,81 +6939,89 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_4FF9AAC8_5E59_49bd_AFA8_D5DCED9D61C7" modelElement="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
 				<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="1021" width="200" height="70"/>
+				<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="2071" y="1667" 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="2143" y="1632" 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="260"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_98A5_58BD6A43131C" x="2803" y="260"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_98A5_58BD6A43131C" x="2803" y="1855"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5E59_49bd_98A5_58BD6A43131C" x="2131" y="1855"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5E59_49bd_98A5_58BD6A43131C" x="2131" y="1627"/>
+				<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="1395" width="87" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AA17_2A8EC003CCFE" x="1503" y="1530" width="117" 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="1419" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AA17_2A8EC003CCFE" text="0..*" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AA17_2A8EC003CCFE" x="1485" y="1552" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB11_165E12CB38A6" x="1088" y="1413"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB11_165E12CB38A6" x="1254" y="1413"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AA17_2A8EC003CCFE" x="1736" y="1258"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AA17_2A8EC003CCFE" x="1736" y="1547"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AA17_2A8EC003CCFE" x="1482" y="1547"/>
+			</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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9939_FA613CEB5D22" x="1243" y="1124" width="160" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9939_FA613CEB5D22" x="1243" y="1147" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9939_FA613CEB5D22" x="1577" y="1142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9939_FA613CEB5D22" x="1240" y="1142"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_A8A7_C0037581B6D3" x="1577" y="1039"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A8A7_C0037581B6D3" x="1272" y="1039"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_A8A7_C0037581B6D3" x="1577" y="1111"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A8A7_C0037581B6D3" x="1272" y="1111"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A8A7_C0037581B6D3" x="1272" y="909"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1031" y="1360" width="189" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1031" y="1469" width="189" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1029" y="1387" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1029" y="1496" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1598" y="1175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB2B_CBE8A5D24AC5" x="1598" y="1357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AB2B_CBE8A5D24AC5" x="1021" y="1357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_AB2B_CBE8A5D24AC5" x="1021" y="1405"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB2B_CBE8A5D24AC5" x="1598" y="1258"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB2B_CBE8A5D24AC5" x="1598" y="1440"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AB2B_CBE8A5D24AC5" x="1021" y="1440"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_AB2B_CBE8A5D24AC5" x="1021" y="1514"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_878A_8035A42A43F9" text="+epo:involvesBuyer" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_878A_8035A42A43F9" x="1490" y="1395" width="80" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_878A_8035A42A43F9" x="1490" y="1504" width="80" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_878A_8035A42A43F9" text="0..*" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_878A_8035A42A43F9" x="1486" y="1423" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_878A_8035A42A43F9" x="1486" y="1532" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_878A_8035A42A43F9" x="1638" y="1175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_878A_8035A42A43F9" x="1638" y="1416"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_878A_8035A42A43F9" x="1482" y="1416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_878A_8035A42A43F9" x="1638" y="1258"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_878A_8035A42A43F9" x="1638" y="1525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_878A_8035A42A43F9" x="1482" y="1525"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_8CA6_9C68826B377B" x="1736" y="1303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8CA6_9C68826B377B" x="1635" y="1416"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8CA6_9C68826B377B" x="1736" y="1386"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8CA6_9C68826B377B" x="1635" y="1525"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_A7B8_F5FEC69BBDA5" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_A7B8_F5FEC69BBDA5" text="+epo:indicatesInvoiceeContactPoint" modelElement="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="2408" y="1791" width="143" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="2408" y="1909" width="143" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_A7B8_F5FEC69BBDA5" x="1369" y="1472"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A7B8_F5FEC69BBDA5" x="1369" y="1809"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A7B8_F5FEC69BBDA5" x="2553" y="1809"/>
+				<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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A7B8_F5FEC69BBDA5" x="2553" y="1927"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_BBA1_4FFA393BE7FA" text="+epo:delegatesAncillaryActivitiesTo" modelElement="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1114" y="1446" width="143" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1114" y="1555" width="143" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_BBA1_4FFA393BE7FA" text="0..*" modelElement="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1091" y="1448" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1091" y="1557" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1254" y="1443"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BBA1_4FFA393BE7FA" x="1088" y="1443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BBA1_4FFA393BE7FA" x="1254" y="1552"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BBA1_4FFA393BE7FA" x="1088" y="1552"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_A104_F62859765981" x="768" y="751"/>
@@ -6632,9 +7029,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A104_F62859765981" x="993" y="705"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_92ED_5A488B7D6FC6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_92ED_5A488B7D6FC6" x="752" y="984"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_92ED_5A488B7D6FC6" x="752" y="1049"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_92ED_5A488B7D6FC6" x="1119" y="1049"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_92ED_5A488B7D6FC6" x="914" y="952"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_92ED_5A488B7D6FC6" x="1171" y="952"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_92ED_5A488B7D6FC6" x="1171" y="1094"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_9472_AFC131D1E7F2" x="1816" y="635"/>
@@ -6644,48 +7041,66 @@
 				<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_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_5E59_49bd_AA17_2A8EC003CCFE" text="+epo:isResponsibilityOfBuyer" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AA17_2A8EC003CCFE" x="1503" y="1421" width="117" height="14"/>
+			<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_AA17_2A8EC003CCFE" text="0..*" modelElement="EAID_dst1E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AA17_2A8EC003CCFE" x="1485" y="1443" width="17" height="14"/>
+				<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_AA17_2A8EC003CCFE" x="1736" y="1175"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AA17_2A8EC003CCFE" x="1736" y="1438"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AA17_2A8EC003CCFE" x="1482" y="1438"/>
+				<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_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="975" 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="1003" 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="1021"/>
+				<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_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="1625" y="916" width="171" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_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_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_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="1755" y="902" width="17" height="14"/>
+				<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_9195_C96F98BD3349" x="1743" y="1012"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9195_C96F98BD3349" x="1743" y="897"/>
+				<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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BF56_83000481AB12" x="549" y="1112"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_BF56_83000481AB12" x="1119" y="1112"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_A633_615CD23835C1" x="1228" y="501"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A633_615CD23835C1" x="1228" y="649"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A633_615CD23835C1" x="1154" y="649"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AD37_79213AD539C8" x="2192" y="921" width="221" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AD37_79213AD539C8" x="2274" y="1025" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AD37_79213AD539C8" x="1314" y="909"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AD37_79213AD539C8" x="1314" y="1020"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AD37_79213AD539C8" x="2293" y="1020"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_A39E_E74480CCE1D0" text="+epo:foreseesContractSpecificTerm" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_A39E_E74480CCE1D0" x="1494" y="672" width="142" height="14"/>
@@ -6702,80 +7117,55 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A5CD_27AE1D84CDDE" x="1430" y="666"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_A5CD_27AE1D84CDDE" x="1154" y="666"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_AD37_79213AD539C8" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AD37_79213AD539C8" x="463" y="1324" width="221" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AD37_79213AD539C8" x="577" y="1405" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AD37_79213AD539C8" x="569" y="1294"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AD37_79213AD539C8" x="569" y="1423"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9E66_5EBEFD7759BC" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9E66_5EBEFD7759BC" text="+epo:hasLaunchGroupFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9E66_5EBEFD7759BC" x="228" y="1356" width="245" height="14"/>
-				</ownedElement>
-				<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="409" y="1405" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9E66_5EBEFD7759BC" x="401" y="1294"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9E66_5EBEFD7759BC" x="401" y="1423"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_897A_253ACD64FC8A" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_897A_253ACD64FC8A" x="577" y="1224"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_897A_253ACD64FC8A" x="577" y="1073"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_897A_253ACD64FC8A" x="1119" y="1073"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_897A_253ACD64FC8A" x="577" y="1307"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_897A_253ACD64FC8A" x="577" y="1147"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_897A_253ACD64FC8A" x="1119" y="1147"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_98F9_263E29761C37" x="492" y="1224"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_98F9_263E29761C37" x="492" y="1307"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_98F9_263E29761C37" x="492" y="660"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_98F9_263E29761C37" x="993" y="660"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8A8A_E03C23ED1BE1" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8A8A_E03C23ED1BE1" x="378" y="1224"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8A8A_E03C23ED1BE1" x="378" y="1307"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8A8A_E03C23ED1BE1" x="378" y="623"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8A8A_E03C23ED1BE1" x="1480" y="623"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_BE01_736C22D89AEA" x="2093" y="1067"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BE01_736C22D89AEA" x="2044" y="1067"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BE01_736C22D89AEA" x="2044" y="1314"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BE01_736C22D89AEA" x="2093" y="1197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BE01_736C22D89AEA" x="2044" y="1197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BE01_736C22D89AEA" x="2044" y="1406"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_850E_F68332FB1B0B" source="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" target="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" modelElement="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_850E_F68332FB1B0B" x="2293" y="1074"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_850E_F68332FB1B0B" x="2390" y="1074"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_850E_F68332FB1B0B" x="2390" y="1348"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_850E_F68332FB1B0B" x="2293" y="1204"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_850E_F68332FB1B0B" x="2390" y="1204"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_850E_F68332FB1B0B" x="2390" y="1440"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_BEE6_89F708783872" text="+locn:address" modelElement="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BEE6_89F708783872" x="2168" y="1425" width="56" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BEE6_89F708783872" x="2168" y="1543" width="56" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_BEE6_89F708783872" text="0..1" modelElement="EAID_dst0B3C1A_A0BD_494b_BEE6_89F708783872">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BEE6_89F708783872" x="2195" y="1456" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BEE6_89F708783872" x="2195" y="1574" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BEE6_89F708783872" x="2187" y="1091"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BEE6_89F708783872" x="2187" y="1474"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BEE6_89F708783872" x="2187" y="1221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BEE6_89F708783872" x="2187" y="1592"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_8346_839CB32AF64E" text="+locn:geometry" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8346_839CB32AF64E" x="2403" y="1038" width="64" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8346_839CB32AF64E" x="2403" y="1168" width="64" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_8346_839CB32AF64E" text="0..1" modelElement="EAID_dst8E8C16_CD7F_4664_8346_839CB32AF64E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8346_839CB32AF64E" x="2450" y="1061" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8346_839CB32AF64E" x="2450" y="1191" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8346_839CB32AF64E" x="2293" y="1056"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8346_839CB32AF64E" x="2469" y="1056"/>
+				<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="2469" 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_9563_4C96020D607C" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" modelElement="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9563_4C96020D607C" text="+epo:hasConstraint" modelElement="EAID_dst5C20FC_D382_4766_9563_4C96020D607C">
@@ -6788,191 +7178,218 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9563_4C96020D607C" x="2610" y="496"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B8AA_9EA312803C2B" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B8AA_9EA312803C2B" x="1887" y="1469"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B8AA_9EA312803C2B" x="1887" y="1320"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B8AA_9EA312803C2B" x="1990" y="1320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B8AA_9EA312803C2B" x="1887" y="1587"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B8AA_9EA312803C2B" x="1887" y="1412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B8AA_9EA312803C2B" x="1990" y="1412"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9581_3601B37AA6A4" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_29678A10_6473_461a_BE84_76269B5BBD68" modelElement="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9581_3601B37AA6A4" text="+cv:registeredAddress" modelElement="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9581_3601B37AA6A4" x="2001" y="1539" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9581_3601B37AA6A4" x="2001" y="1657" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9581_3601B37AA6A4" text="0..1" modelElement="EAID_dst236B4B_9308_46ad_9581_3601B37AA6A4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9581_3601B37AA6A4" x="2074" y="1564" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9581_3601B37AA6A4" x="2074" y="1682" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9581_3601B37AA6A4" x="1990" y="1559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9581_3601B37AA6A4" x="2093" y="1559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9581_3601B37AA6A4" x="1990" y="1677"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9581_3601B37AA6A4" x="2093" y="1677"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9644_C85CAC550728" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_677B606B_352C_459b_9644_C85CAC550728">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9644_C85CAC550728" x="1907" y="1469"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9644_C85CAC550728" x="1907" y="1363"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9644_C85CAC550728" x="1990" y="1363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9644_C85CAC550728" x="1907" y="1587"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9644_C85CAC550728" x="1907" y="1455"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9644_C85CAC550728" x="1990" y="1455"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8887_BFF48DC77200" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" modelElement="EAID_15FE118D_5443_4723_8887_BFF48DC77200">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8887_BFF48DC77200" x="2731" y="1491"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8887_BFF48DC77200" x="2731" y="1396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8887_BFF48DC77200" x="2730" y="1609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8887_BFF48DC77200" x="2730" y="1488"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_811D_F82085D6A825" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" modelElement="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_811D_F82085D6A825" x="2569" y="1491"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_811D_F82085D6A825" x="2569" y="1396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_811D_F82085D6A825" x="2570" y="1609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_811D_F82085D6A825" x="2570" y="1488"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B370_202D9A0110E0" x="2795" y="1635" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B370_202D9A0110E0" x="2790" y="1624" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B370_202D9A0110E0" x="2787" y="1670"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B370_202D9A0110E0" x="2787" y="1670"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B370_202D9A0110E0" x="2824" y="1670"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_B370_202D9A0110E0" x="2824" y="1619"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5E59_49bd_B370_202D9A0110E0" x="2787" y="1619"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5E59_49bd_B370_202D9A0110E0" x="2787" y="1619"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_82ED_0BAA7D433501" text="+cv:address" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_82ED_0BAA7D433501" x="2322" y="1507" width="49" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_82ED_0BAA7D433501" x="2322" y="1625" width="49" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_82ED_0BAA7D433501" text="0..*" modelElement="EAID_dst23612C_1865_4c8b_82ED_0BAA7D433501">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_82ED_0BAA7D433501" x="2298" y="1530" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_82ED_0BAA7D433501" x="2298" y="1648" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_82ED_0BAA7D433501" x="2534" y="1525"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_82ED_0BAA7D433501" x="2295" y="1525"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_82ED_0BAA7D433501" x="2534" y="1643"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_82ED_0BAA7D433501" x="2295" y="1643"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_AD39_5BA2A66950B9" text="+cv:registeredAddress" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AD39_5BA2A66950B9" x="2321" y="1543" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_AD39_5BA2A66950B9" x="2321" y="1661" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_AD39_5BA2A66950B9" text="0..1" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AD39_5BA2A66950B9" x="2298" y="1562" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_AD39_5BA2A66950B9" x="2298" y="1680" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AD39_5BA2A66950B9" x="2534" y="1557"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AD39_5BA2A66950B9" x="2295" y="1557"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AD39_5BA2A66950B9" x="2534" y="1675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AD39_5BA2A66950B9" x="2295" y="1675"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_82F3_D4CC50B411F4" text="+epo:hasPrimaryContactPoint" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_82F3_D4CC50B411F4" x="2596" y="1637" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_82F3_D4CC50B411F4" x="2596" y="1755" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_82F3_D4CC50B411F4" text="0..*" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_82F3_D4CC50B411F4" x="2656" y="1652" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_82F3_D4CC50B411F4" x="2656" y="1770" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_82F3_D4CC50B411F4" x="2653" y="1615"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_82F3_D4CC50B411F4" x="2653" y="1689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_82F3_D4CC50B411F4" x="2653" y="1733"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_82F3_D4CC50B411F4" x="2653" y="1807"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_AB43_E5A825C5F2E2" x="2782" y="1491"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB43_E5A825C5F2E2" x="2782" y="1321"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AB43_E5A825C5F2E2" x="2080" y="1321"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_AB43_E5A825C5F2E2" x="2782" y="1609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_AB43_E5A825C5F2E2" x="2782" y="1413"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_AB43_E5A825C5F2E2" x="2080" y="1413"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_BD17_379180274988" text="+cv:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BD17_379180274988" x="2173" y="1652" width="49" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_BD17_379180274988" x="2173" y="1770" width="49" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BD17_379180274988" x="2205" y="1632" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BD17_379180274988" x="2205" y="1750" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BD17_379180274988" x="2553" y="1727"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BD17_379180274988" x="2193" y="1727"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BD17_379180274988" x="2193" y="1627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BD17_379180274988" x="2553" y="1845"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BD17_379180274988" x="2193" y="1845"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_BD17_379180274988" x="2193" y="1745"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9939_FA613CEB5D22" x="1244" y="1056" width="160" 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_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9939_FA613CEB5D22" x="1244" y="1079" 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_9939_FA613CEB5D22" x="1577" y="1081"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9939_FA613CEB5D22" x="1241" y="1074"/>
+				<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_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="1474"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B227_85988E5F2016" x="2246" y="1382"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B227_85988E5F2016" x="2355" y="1382"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9E13_5EC63FC08031" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9E13_5EC63FC08031" x="1005" y="1251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9E13_5EC63FC08031" x="1005" y="1169"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9E13_5EC63FC08031" x="1119" y="1169"/>
 			</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_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"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A80D_69ACBFA6147C" x="2375" y="624"/>
-			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B380_6FDE59360DAF" x="1425" y="869" width="143" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_80BE_9C778A0BA2A5" x="1168" y="682" width="132" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B380_6FDE59360DAF" text="0..*" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B380_6FDE59360DAF" x="1577" y="891" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_80BE_9C778A0BA2A5" x="1157" y="704" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B380_6FDE59360DAF" x="1436" y="1168"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B380_6FDE59360DAF" x="1436" y="886"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B380_6FDE59360DAF" x="1596" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_80BE_9C778A0BA2A5" x="1676" y="768"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_80BE_9C778A0BA2A5" x="1676" y="699"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_80BE_9C778A0BA2A5" x="1154" y="699"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B67E_B79F177247C7" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B67E_B79F177247C7" text="+epo:refersToPreviousProcedure" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B67E_B79F177247C7" x="1441" y="1109" width="131" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B087_27A619B6C819" x="2540" y="741" width="142" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B67E_B79F177247C7" text="0..1" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B67E_B79F177247C7" x="1557" y="1135" width="17" height="14"/>
+				<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_B67E_B79F177247C7" x="1496" y="1168"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B67E_B79F177247C7" x="1496" y="1128"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B67E_B79F177247C7" x="1577" y="1128"/>
+				<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_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>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8F89_5D58DD92BF3C" x="1392" y="1168"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8F89_5D58DD92BF3C" x="1392" y="1094"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8F89_5D58DD92BF3C" x="1241" y="1094"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_9E66_5EBEFD7759BC" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9E66_5EBEFD7759BC" x="2265" y="893" width="221" height="14"/>
+				</ownedElement>
+				<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_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>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9069_38D7A3B7A01C" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9069_38D7A3B7A01C" text="+epo:definesLotGroup" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9069_38D7A3B7A01C" x="1986" y="905" width="89" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_8F62_2FA41A99DF74" text="+epo:hasEstimatedValue" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8F62_2FA41A99DF74" x="2439" y="942" width="101" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9069_38D7A3B7A01C" text="0..*" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9069_38D7A3B7A01C" x="2033" y="872" width="17" height="14"/>
+				<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_9069_38D7A3B7A01C" x="1155" y="1259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9069_38D7A3B7A01C" x="2021" y="1259"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9069_38D7A3B7A01C" x="2021" y="867"/>
+				<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_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>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9E13_5EC63FC08031" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9E13_5EC63FC08031" x="1005" y="1168"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9E13_5EC63FC08031" x="1005" y="1097"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9E13_5EC63FC08031" x="1119" y="1097"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_8C52_BAE14F5149F6" x="2147" y="1592"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8C52_BAE14F5149F6" x="2147" y="1454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8C52_BAE14F5149F6" x="2080" y="1454"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_80CD_0C45E80E9AEE" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" modelElement="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_80CD_0C45E80E9AEE" text="+epo:definesMediator" modelElement="EAID_dst05A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_80CD_0C45E80E9AEE" x="777" y="1368" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_80CD_0C45E80E9AEE" x="777" y="1477" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_80CD_0C45E80E9AEE" text="0..1" modelElement="EAID_dst05A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_80CD_0C45E80E9AEE" x="841" y="1385" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_80CD_0C45E80E9AEE" x="841" y="1494" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_80CD_0C45E80E9AEE" x="868" y="1223"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_80CD_0C45E80E9AEE" x="833" y="1223"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_80CD_0C45E80E9AEE" x="833" y="1403"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_80CD_0C45E80E9AEE" x="868" y="1306"/>
+				<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_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="808" width="131" height="14"/>
+			<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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B227_85988E5F2016" x="2355" y="1474"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_9069_38D7A3B7A01C" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_9069_38D7A3B7A01C" text="+epo:definesLotGroup" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_9069_38D7A3B7A01C" x="1983" y="920" width="89" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BFE6_593632EDB11F" x="1847" y="831" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_9069_38D7A3B7A01C" text="0..*" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_9069_38D7A3B7A01C" x="2030" y="887" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BFE6_593632EDB11F" x="1989" y="826"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BFE6_593632EDB11F" x="1844" y="826"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_9069_38D7A3B7A01C" x="1155" y="1339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_9069_38D7A3B7A01C" x="2018" y="1339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_9069_38D7A3B7A01C" x="2018" y="882"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_B087_27A619B6C819" text="+epo:specifiesProcurementCriterion" modelElement="EAID_dst7073E1_3362_472f_B087_27A619B6C819">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B087_27A619B6C819" x="2548" y="741" width="142" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8F89_5D58DD92BF3C" x="1394" y="1251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8F89_5D58DD92BF3C" x="1394" y="1185"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8F89_5D58DD92BF3C" x="1240" y="1185"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B67E_B79F177247C7" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B67E_B79F177247C7" text="+epo:refersToPreviousProcedure" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B67E_B79F177247C7" x="1441" y="1162" width="131" height="14"/>
 				</ownedElement>
-				<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="2627" y="717" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B67E_B79F177247C7" text="0..1" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B67E_B79F177247C7" x="1557" y="1188" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B087_27A619B6C819" x="2079" y="827"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B087_27A619B6C819" x="2615" y="827"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B087_27A619B6C819" x="2615" y="712"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B67E_B79F177247C7" x="1496" y="1251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B67E_B79F177247C7" x="1496" y="1181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B67E_B79F177247C7" x="1577" y="1181"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_5E59_49bd_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_80BE_9C778A0BA2A5" x="1168" y="682" width="132" height="14"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B380_6FDE59360DAF" x="1425" y="869" width="143" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_80BE_9C778A0BA2A5" x="1157" y="704" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B380_6FDE59360DAF" text="0..*" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B380_6FDE59360DAF" x="1577" y="891" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_80BE_9C778A0BA2A5" x="1676" y="768"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_80BE_9C778A0BA2A5" x="1676" y="699"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_80BE_9C778A0BA2A5" x="1154" y="699"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B380_6FDE59360DAF" x="1442" y="1251"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B380_6FDE59360DAF" x="1442" y="886"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B380_6FDE59360DAF" x="1596" y="886"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_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_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 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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_A80D_69ACBFA6147C" x="2375" y="624"/>
 			</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">
@@ -6985,10 +7402,15 @@
 				<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_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_5E59_49bd_8C52_BAE14F5149F6" x="2147" y="1474"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8C52_BAE14F5149F6" x="2147" y="1362"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_8C52_BAE14F5149F6" x="2080" y="1362"/>
+			<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"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_BFE6_593632EDB11F" x="1847" y="835" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_BFE6_593632EDB11F" x="1980" y="830"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BFE6_593632EDB11F" x="1844" y="830"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_47122B38_736F_476f_9668_E7EFAD723B51" isFrame="false" modelElement="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72">
@@ -6998,7 +7420,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_BF42_2A6E50CAF4E6" x="157" y="823" width="167" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_BF42_2A6E50CAF4E6" x="157" y="824" width="206" height="84"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_AC62_FA4769B4D88C" text="epo:Lot"/>
@@ -7008,13 +7430,9 @@
 				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_9284_B6F7309F5985" modelElement="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_9284_B6F7309F5985" text="epo:OfferingParty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_9284_B6F7309F5985" x="1043" y="157" width="90" height="70"/>
-			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_9491_D5301EE0DDE7" x="1188" y="227" width="96" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_9491_D5301EE0DDE7" x="1041" y="227" width="96" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_B8D8_207479C15419" text="epo:Tender"/>
@@ -7026,7 +7444,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_BE40_C921C05C776E" modelElement="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_BE40_C921C05C776E" text="epo:TenderGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_BE40_C921C05C776E" x="192" y="403" width="161" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_BE40_C921C05C776E" x="192" y="403" width="171" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_47122B38_736F_476f_8C56_63A3A737F49A" modelElement="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_8C56_63A3A737F49A" text="epo:SubmissionStatisticalInformation"/>
@@ -7036,36 +7454,20 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_736F_476f_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_736F_476f_B795_B4D7DEE0BA53" x="915" y="227" width="96" height="70"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A52E_6EBA9F23871A" text="+epo:hasSubcontractingEstimatedValue" modelElement="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A52E_6EBA9F23871A" x="749" y="534" width="160" height="14"/>
-				</ownedElement>
-				<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_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>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A43E_D33DC6607852" x="1223" y="227"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A43E_D33DC6607852" x="1223" y="190"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_A43E_D33DC6607852" x="1133" y="190"/>
-			</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"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_9E66_5EBEFD7759BC" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_9E66_5EBEFD7759BC" x="243" y="480" width="221" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_B489_34E46CFF8E24" text="0..1" modelElement="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_B489_34E46CFF8E24" x="737" y="511" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_9E66_5EBEFD7759BC" text="0..1" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_9E66_5EBEFD7759BC" x="447" y="503" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_B489_34E46CFF8E24" x="951" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_B489_34E46CFF8E24" x="951" y="501"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_B489_34E46CFF8E24" x="733" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_9E66_5EBEFD7759BC" x="302" y="824"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_9E66_5EBEFD7759BC" x="302" y="498"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_9E66_5EBEFD7759BC" x="466" y="498"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_9F78_AF7887C44E46" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" modelElement="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_9F78_AF7887C44E46" text="+epo:isSubmitedBy" modelElement="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_9F78_AF7887C44E46" x="917" y="315" width="78" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_9F78_AF7887C44E46" x="918" y="332" width="78" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_9F78_AF7887C44E46" text="0..1" modelElement="EAID_dst26EBD4_4329_4e57_9F78_AF7887C44E46">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_9F78_AF7887C44E46" x="973" y="302" width="17" height="14"/>
@@ -7085,19 +7487,24 @@
 			</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="1050" y="256" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A646_9A2FDEE01B0F" x="1046" 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="1169" y="278" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A646_9A2FDEE01B0F" x="1099" y="302" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A646_9A2FDEE01B0F" x="1082" y="363"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A646_9A2FDEE01B0F" x="1082" y="273"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_A646_9A2FDEE01B0F" x="1188" y="273"/>
+				<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"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A409_64CB2CE61248" x="960" y="227"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A409_64CB2CE61248" x="960" y="191"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_A409_64CB2CE61248" x="1043" y="191"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_B61D_661F42799A98" x="131" y="746" width="105" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_B61D_661F42799A98" text="0..1" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_B61D_661F42799A98" x="185" y="806" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_B61D_661F42799A98" x="915" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_B61D_661F42799A98" x="177" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_B61D_661F42799A98" x="177" y="824"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
@@ -7109,15 +7516,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_86E7_B4E433F87208" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_86E7_B4E433F87208" x="424" y="590" width="155" height="14"/>
+			<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"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_86E7_B4E433F87208" text="0..1" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_86E7_B4E433F87208" x="532" y="571" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_B489_34E46CFF8E24" text="0..1" modelElement="EAID_dst964CE9_B09A_4855_B489_34E46CFF8E24">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_B489_34E46CFF8E24" x="737" y="511" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_86E7_B4E433F87208" x="520" y="620"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_86E7_B4E433F87208" x="520" y="566"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_B489_34E46CFF8E24" x="951" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_B489_34E46CFF8E24" x="951" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_B489_34E46CFF8E24" x="733" y="501"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
@@ -7129,6 +7537,27 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_9195_C96F98BD3349" x="1315" y="671"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_9195_C96F98BD3349" x="1122" y="671"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_86E7_B4E433F87208" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_86E7_B4E433F87208" x="424" y="590" width="155" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_86E7_B4E433F87208" text="0..1" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_86E7_B4E433F87208" x="532" y="571" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_86E7_B4E433F87208" x="520" y="620"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_86E7_B4E433F87208" x="520" y="566"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_8F62_2FA41A99DF74" text="+epo:hasEstimatedValue" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_8F62_2FA41A99DF74" x="363" y="527" width="101" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_8F62_2FA41A99DF74" text="0..1" modelElement="EAID_dstA7614C_D179_4558_8F62_2FA41A99DF74">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_8F62_2FA41A99DF74" x="447" y="550" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_8F62_2FA41A99DF74" x="333" y="824"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_8F62_2FA41A99DF74" x="333" y="545"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_8F62_2FA41A99DF74" x="466" y="545"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_BFE6_593632EDB11F" x="934" y="738" width="131" height="14"/>
@@ -7136,19 +7565,19 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_BFE6_593632EDB11F" x="1036" y="701" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_BFE6_593632EDB11F" x="324" y="895"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_BFE6_593632EDB11F" x="1024" y="895"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_BFE6_593632EDB11F" x="363" y="896"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_BFE6_593632EDB11F" x="1024" y="896"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_BFE6_593632EDB11F" x="1024" y="696"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A283_8978FB00BD51" text="+epo:isSubmittedForLotGroup" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A283_8978FB00BD51" x="213" y="784" width="120" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A283_8978FB00BD51" x="185" y="785" width="120" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A283_8978FB00BD51" text="1" modelElement="EAID_dstAB3946_257D_4382_A283_8978FB00BD51">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A283_8978FB00BD51" x="278" y="805" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A283_8978FB00BD51" x="250" y="806" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A283_8978FB00BD51" x="270" y="462"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A283_8978FB00BD51" x="270" y="823"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A283_8978FB00BD51" x="242" y="462"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A283_8978FB00BD51" x="242" y="824"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_A8CB_6EBF4CDA67D5" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_736F_476f_A8CB_6EBF4CDA67D5" text="+epo:comprisesTender" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
@@ -7157,17 +7586,17 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A8CB_6EBF4CDA67D5" text="1..*" modelElement="EAID_dst8D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A8CB_6EBF4CDA67D5" x="896" y="419" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A8CB_6EBF4CDA67D5" x="353" y="414"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A8CB_6EBF4CDA67D5" x="363" y="414"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A8CB_6EBF4CDA67D5" x="915" y="414"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A677_A1E36D3B53C0" text="+epo:hasTotalValue" modelElement="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A677_A1E36D3B53C0" x="551" y="441" width="81" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A677_A1E36D3B53C0" text="1" modelElement="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A677_A1E36D3B53C0" x="610" y="457" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_A677_A1E36D3B53C0" text="0..1" modelElement="EAID_dst92C123_93F7_4d51_A677_A1E36D3B53C0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_A677_A1E36D3B53C0" x="610" y="457" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A677_A1E36D3B53C0" x="353" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_A677_A1E36D3B53C0" x="363" y="430"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_A677_A1E36D3B53C0" x="602" y="430"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_A677_A1E36D3B53C0" x="602" y="475"/>
 			</ownedElement>
@@ -7181,287 +7610,287 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_736F_476f_94D7_26E6E451AF0C" x="672" y="620"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_94D7_26E6E451AF0C" x="672" y="566"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_B61D_661F42799A98" x="130" y="745" width="105" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_47122B38_736F_476f_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_736F_476f_A52E_6EBA9F23871A" text="+epo:hasSubcontractingEstimatedValue" modelElement="EAID_dstAE269D_7874_4515_A52E_6EBA9F23871A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_736F_476f_A52E_6EBA9F23871A" x="749" y="534" width="160" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_736F_476f_B61D_661F42799A98" text="0..1" modelElement="EAID_dst5EC3B7_635F_49aa_B61D_661F42799A98">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_736F_476f_B61D_661F42799A98" x="184" y="805" width="17" height="14"/>
+				<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_B61D_661F42799A98" x="915" y="368"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_736F_476f_B61D_661F42799A98" x="176" y="368"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_736F_476f_B61D_661F42799A98" x="176" y="823"/>
+				<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_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>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_0717D631_676D_41e7_B708_35BFDDC475A8" isFrame="false" modelElement="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_94AC_B4EC57A6B248" text="epo:NoticeAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_94AC_B4EC57A6B248" x="170" y="145" width="226" height="143"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_94AC_B4EC57A6B248" x="148" y="44" width="226" height="143"/>
 			</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="675" y="145" width="412" height="219"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_9B44_2FCDD6AB5C9D" x="653" y="44" width="412" height="219"/>
 			</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="219" y="496" width="128" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_BF42_2A6E50CAF4E6" x="197" y="395" width="171" height="62"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_AC62_FA4769B4D88C" x="815" y="736" width="147" height="66"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_AC62_FA4769B4D88C" x="793" y="635" width="147" height="66"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_A416_3E77939F9B7A" modelElement="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_A416_3E77939F9B7A" text="epo:LotAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_A416_3E77939F9B7A" x="762" y="464" width="297" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_A416_3E77939F9B7A" x="740" y="363" width="297" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_B4CE_1CC777975EF3" modelElement="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_B4CE_1CC777975EF3" text="epo:Winner"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B4CE_1CC777975EF3" x="1260" y="339" width="129" height="48"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B4CE_1CC777975EF3" x="1176" y="295" width="129" height="48"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_B4D4_D8AE4F96B00B" modelElement="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_B4D4_D8AE4F96B00B" text="epo:TenderAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B4D4_D8AE4F96B00B" x="1173" y="526" width="178" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B4D4_D8AE4F96B00B" x="1151" y="425" width="178" height="59"/>
 			</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="1151" y="725" width="224" height="87"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_B8D8_207479C15419" x="1129" y="624" 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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_8AC2_D7789CCFB7F8" x="367" y="628" width="273" height="72"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_8AC2_D7789CCFB7F8" x="345" y="527" width="273" height="72"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_80CC_7E68CBDEDED2" modelElement="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_80CC_7E68CBDEDED2" text="epo:LotGroupAwardInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_80CC_7E68CBDEDED2" x="202" y="303" width="160" height="45"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_80CC_7E68CBDEDED2" x="180" y="202" width="160" height="45"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_BE33_620A29646687" modelElement="EAID_E7437025_771F_4143_BE33_620A29646687">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_BE33_620A29646687" text="epo:AwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_BE33_620A29646687" x="463" y="468" width="103" height="106"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_BE33_620A29646687" x="441" y="367" width="103" height="106"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_0717D631_676D_41e7_AD48_245A5F11A4D5" modelElement="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_676D_41e7_AD48_245A5F11A4D5" text="epo:MiniCompetitionAwardOutcome"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_AD48_245A5F11A4D5" x="662" y="629" width="187" height="35"/>
-			</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="828" y="422" 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="937" y="369" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A6DC_62DFC84C122D" x="925" y="464"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A6DC_62DFC84C122D" x="925" y="364"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_676D_41e7_AD48_245A5F11A4D5" x="640" y="528" width="187" height="35"/>
 			</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="430" y="294" width="217" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B06C_0EA23C9FD1C7" x="408" y="193" 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="656" y="321" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B06C_0EA23C9FD1C7" x="634" y="220" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B06C_0EA23C9FD1C7" x="362" y="316"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B06C_0EA23C9FD1C7" x="675" y="316"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B06C_0EA23C9FD1C7" x="340" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B06C_0EA23C9FD1C7" x="653" y="215"/>
 			</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="445" y="190" width="203" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A935_786F35AF2AFB" x="423" y="89" 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="656" y="211" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A935_786F35AF2AFB" x="634" y="110" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A935_786F35AF2AFB" x="396" y="206"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A935_786F35AF2AFB" x="675" y="206"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A935_786F35AF2AFB" x="374" y="105"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A935_786F35AF2AFB" x="653" y="105"/>
 			</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="532" y="138" width="117" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A374_A1CFC018D076" x="510" y="37" 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="656" y="160" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A374_A1CFC018D076" x="634" y="59" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A374_A1CFC018D076" x="396" y="155"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A374_A1CFC018D076" x="675" y="155"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A374_A1CFC018D076" x="374" y="54"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A374_A1CFC018D076" x="653" y="54"/>
 			</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="426" y="214" width="229" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B071_A8B833BDA1EF" x="404" y="113" 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="657" y="241" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B071_A8B833BDA1EF" x="635" y="140" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B071_A8B833BDA1EF" x="396" y="231"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B071_A8B833BDA1EF" x="675" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B071_A8B833BDA1EF" x="374" y="130"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B071_A8B833BDA1EF" x="653" y="130"/>
 			</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="445" y="165" width="204" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8469_562A93DEF12E" x="423" y="64" 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="656" y="187" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8469_562A93DEF12E" x="634" y="86" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8469_562A93DEF12E" x="396" y="182"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8469_562A93DEF12E" x="675" y="182"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8469_562A93DEF12E" x="374" y="81"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8469_562A93DEF12E" x="653" y="81"/>
 			</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="444" y="247" width="206" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_92AE_A27F7DFCCAC3" x="422" y="146" 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="656" y="270" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_92AE_A27F7DFCCAC3" x="634" y="169" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_92AE_A27F7DFCCAC3" x="396" y="265"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_92AE_A27F7DFCCAC3" x="675" y="265"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_92AE_A27F7DFCCAC3" x="374" y="164"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_92AE_A27F7DFCCAC3" x="653" y="164"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_94BC_1C90816E0487" x="866" y="704" width="71" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_94BC_1C90816E0487" x="844" y="603" width="71" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_94BC_1C90816E0487" text="1" modelElement="EAID_dstBA801A_E8C8_4628_94BC_1C90816E0487">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_94BC_1C90816E0487" x="911" y="719" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_94BC_1C90816E0487" x="889" y="618" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_94BC_1C90816E0487" x="901" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_94BC_1C90816E0487" x="901" y="736"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_94BC_1C90816E0487" x="879" y="425"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_94BC_1C90816E0487" x="879" y="635"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_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_676D_41e7_8EBE_A60BD8ED070A" x="762" y="500"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8EBE_A60BD8ED070A" x="566" y="500"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8EBE_A60BD8ED070A" x="740" y="399"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8EBE_A60BD8ED070A" x="544" y="399"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_910B_A28B233CEB46" x="1116" y="222" width="137" height="14"/>
+			<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="692" y="304" width="193" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_910B_A28B233CEB46" x="1090" y="239" width="17" height="14"/>
+				<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="801" y="268" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_910B_A28B233CEB46" x="1059" y="469"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_910B_A28B233CEB46" x="1245" y="469"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_910B_A28B233CEB46" x="1245" y="234"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_676D_41e7_910B_A28B233CEB46" x="1087" y="234"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8D8A_71BD69D25161" x="789" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8D8A_71BD69D25161" x="789" y="263"/>
 			</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="242" y="463" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_93CA_CC7ACC63568D" x="223" 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="299" y="478" width="6" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_93CA_CC7ACC63568D" x="291" y="348"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_93CA_CC7ACC63568D" x="291" y="496"/>
-			</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="405" 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="369" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_93CA_CC7ACC63568D" x="280" y="377" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8D8A_71BD69D25161" x="811" y="464"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8D8A_71BD69D25161" x="811" y="364"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_93CA_CC7ACC63568D" x="272" y="247"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_93CA_CC7ACC63568D" x="272" 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="748" y="629"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9BBA_3C0E1D4E25A8" x="748" y="557"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_9BBA_3C0E1D4E25A8" x="566" y="557"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9BBA_3C0E1D4E25A8" x="726" y="528"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9BBA_3C0E1D4E25A8" x="726" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_9BBA_3C0E1D4E25A8" x="544" y="456"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_9B16_DD484C6E2547" source="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_9B16_DD484C6E2547" text="+epo:isSubmittedForLot" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9B16_DD484C6E2547" x="965" y="752" width="96" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9B16_DD484C6E2547" x="943" y="651" width="96" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_9B16_DD484C6E2547" text="1" modelElement="EAID_dstB4981B_F0BC_4d9f_9B16_DD484C6E2547">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9B16_DD484C6E2547" x="965" y="775" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9B16_DD484C6E2547" x="943" y="674" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9B16_DD484C6E2547" x="1151" y="770"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9B16_DD484C6E2547" x="962" y="770"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9B16_DD484C6E2547" x="1129" y="669"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9B16_DD484C6E2547" x="940" y="669"/>
+			</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="430" y="232" 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="255" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9E66_5EBEFD7759BC" x="347" y="395"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9E66_5EBEFD7759BC" x="347" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_9E66_5EBEFD7759BC" x="653" y="250"/>
+			</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="550" y="232" 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="255" 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="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_8F62_2FA41A99DF74" x="653" y="250"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_BFE6_593632EDB11F" x="682" y="751" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_BFE6_593632EDB11F" x="660" y="650" width="131" height="14"/>
 				</ownedElement>
 				<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="796" y="774" width="17" height="14"/>
+					<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="285" y="546"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BFE6_593632EDB11F" x="285" y="769"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BFE6_593632EDB11F" x="815" y="769"/>
+				<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_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>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_A3E6_B0420EB7CF2A" source="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" target="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" modelElement="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_A3E6_B0420EB7CF2A" text="+epo:indicatesAwardToWinner" modelElement="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A3E6_B0420EB7CF2A" x="1275" y="419" width="124" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_A3E6_B0420EB7CF2A" x="1196" y="375" width="124" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_A3E6_B0420EB7CF2A" text="0..1" modelElement="EAID_dstED3FAD_FABC_4b24_A3E6_B0420EB7CF2A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A3E6_B0420EB7CF2A" x="1331" y="392" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_A3E6_B0420EB7CF2A" x="1252" y="348" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A3E6_B0420EB7CF2A" x="1319" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A3E6_B0420EB7CF2A" x="1319" y="387"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A3E6_B0420EB7CF2A" x="1240" y="425"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A3E6_B0420EB7CF2A" x="1240" y="343"/>
 			</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="1215" y="681" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_9C45_B9A2F9CBFE43" x="1193" y="580" 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="1271" y="707" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_9C45_B9A2F9CBFE43" x="1249" y="606" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9C45_B9A2F9CBFE43" x="1263" y="585"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9C45_B9A2F9CBFE43" x="1263" y="725"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_9C45_B9A2F9CBFE43" x="1241" y="484"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_9C45_B9A2F9CBFE43" x="1241" y="624"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B11C_CBD651205C58" x="438" y="604" width="127" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_B11C_CBD651205C58" x="416" y="503" width="127" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_B11C_CBD651205C58" text="0..*" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B11C_CBD651205C58" x="513" y="583" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_B11C_CBD651205C58" x="491" y="482" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B11C_CBD651205C58" x="503" y="628"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B11C_CBD651205C58" x="503" y="574"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_B11C_CBD651205C58" x="481" y="527"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_B11C_CBD651205C58" x="481" y="473"/>
 			</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="566" y="332" width="87" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_BB1A_167306D6B16C" x="544" y="242" 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="656" y="356" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_BB1A_167306D6B16C" x="634" y="266" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BB1A_167306D6B16C" x="524" y="468"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BB1A_167306D6B16C" x="524" y="351"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BB1A_167306D6B16C" x="675" y="351"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_BB1A_167306D6B16C" x="502" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_BB1A_167306D6B16C" x="502" y="261"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_BB1A_167306D6B16C" x="653" y="261"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_83E6_3CAF530D5403" x="994" y="551" width="155" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_83E6_3CAF530D5403" x="972" y="450" width="155" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_83E6_3CAF530D5403" text="0..*" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_83E6_3CAF530D5403" x="1151" y="519" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_83E6_3CAF530D5403" x="1129" y="418" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_83E6_3CAF530D5403" x="566" y="547"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_83E6_3CAF530D5403" x="1173" y="547"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_83E6_3CAF530D5403" x="544" y="446"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_83E6_3CAF530D5403" x="1151" y="446"/>
 			</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="657" y="390" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_82EA_14ABA20458B6" x="635" y="289" 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="726" y="369" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_82EA_14ABA20458B6" x="704" y="268" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_82EA_14ABA20458B6" x="566" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_82EA_14ABA20458B6" x="714" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_82EA_14ABA20458B6" x="714" y="364"/>
+				<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="692" y="374"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_676D_41e7_82EA_14ABA20458B6" x="692" y="263"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_0717D631_676D_41e7_8978_7B6F899FD855" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_676D_41e7_8978_7B6F899FD855" text="+epo:hasFrameworkAgreementEstimatedValue" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_676D_41e7_8978_7B6F899FD855" x="948" y="398" width="192" height="14"/>
+			<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="806" y="321" width="203" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_676D_41e7_8978_7B6F899FD855" text="0..1" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_676D_41e7_8978_7B6F899FD855" x="1044" y="369" width="17" height="14"/>
+				<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="915" y="268" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_8978_7B6F899FD855" x="1032" y="464"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_8978_7B6F899FD855" x="1032" y="364"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_676D_41e7_A6DC_62DFC84C122D" x="903" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_676D_41e7_A6DC_62DFC84C122D" x="903" y="263"/>
 			</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">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_A942_07304CE66481" modelElement="EAID_0CC18385_984E_4d4c_A942_07304CE66481">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_AFC8_4f2d_A942_07304CE66481" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_A942_07304CE66481" text="at-voc:irregularity-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_A942_07304CE66481" x="1014" y="402" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_A942_07304CE66481" x="1048" y="425" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
@@ -7469,15 +7898,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_AC62_FA4769B4D88C" x="280" y="515" width="250" height="153"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_AC62_FA4769B4D88C" x="513" y="515" width="162" height="58"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AFCB_7D5D95D51A5A" modelElement="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_AFCB_7D5D95D51A5A" text="epo:ReviewIrregularitySummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_AFCB_7D5D95D51A5A" x="595" y="396" width="211" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_AFCB_7D5D95D51A5A" x="695" y="420" width="211" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B2BD_3FD3B49365EE" modelElement="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_B2BD_3FD3B49365EE" text="epo:ContractLotCompletionInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B2BD_3FD3B49365EE" x="2004" y="374" width="298" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B2BD_3FD3B49365EE" x="1580" y="717" width="298" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_95C9_B8B685B22E32" modelElement="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_95C9_B8B685B22E32" text="epo:ReviewDecision"/>
@@ -7485,173 +7914,174 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_A531_93ABFC476500" modelElement="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_A531_93ABFC476500" text="epo:ReviewRequestSummary"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_A531_93ABFC476500" x="576" y="268" width="248" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_A531_93ABFC476500" x="676" y="277" width="248" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_BEC9_90381AD6D4F1" modelElement="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_BEC9_90381AD6D4F1" text="epo:ReviewObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_BEC9_90381AD6D4F1" x="1226" y="158" width="203" height="111"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_BEC9_90381AD6D4F1" x="1224" y="239" width="203" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B0AA_8B1D0C8C20CA" modelElement="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_AFC8_4f2d_B0AA_8B1D0C8C20CA" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_B0AA_8B1D0C8C20CA" text="at-voc:review-decision-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B0AA_8B1D0C8C20CA" x="752" y="543" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B0AA_8B1D0C8C20CA" x="807" y="544" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_8805_0F3BB79051BE" modelElement="EAID_E95530AB_B746_4056_8805_0F3BB79051BE">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_AFC8_4f2d_8805_0F3BB79051BE" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_8805_0F3BB79051BE" text="at-voc:remedy-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_8805_0F3BB79051BE" x="1224" y="668" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_8805_0F3BB79051BE" x="1224" y="657" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B59A_3107FF9B30BC" modelElement="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_AFC8_4f2d_B59A_3107FF9B30BC" text="epo:ReviewRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B59A_3107FF9B30BC" x="1354" y="523" width="238" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B615_FA2A1785469E" modelElement="EAID_81C81B52_091E_44a3_B615_FA2A1785469E">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B615_FA2A1785469E" x="898" y="132" width="115" height="55"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_AFC8_4f2d_B615_FA2A1785469E" x="742" y="160" width="115" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AA0C_F4AAB1D0346B" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1174" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1174" y="211"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1226" y="211"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1200" y="553"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1276" y="553"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AA0C_F4AAB1D0346B" x="1276" y="350"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_8D4A_95B9DD217458" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_8D4A_95B9DD217458" text="+epo:providesContractTotalPaymentValue" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_8D4A_95B9DD217458" x="1882" y="403" width="147" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_8D4A_95B9DD217458" x="1777" y="477" width="14" height="170"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_8D4A_95B9DD217458" text="0..1" modelElement="EAID_dst377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_8D4A_95B9DD217458" x="1850" y="423" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_8D4A_95B9DD217458" x="1813" y="460" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_8D4A_95B9DD217458" x="2004" y="418"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_8D4A_95B9DD217458" x="1847" y="418"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_8D4A_95B9DD217458" x="1801" y="717"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_8D4A_95B9DD217458" x="1801" y="455"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AACD_8319D1389BB9" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_AACD_8319D1389BB9" text="+epo:providesContractTotalPenaltyValue" modelElement="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AACD_8319D1389BB9" x="1863" y="366" width="141" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AACD_8319D1389BB9" x="1715" y="480" width="14" height="164"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_AACD_8319D1389BB9" text="0..1" modelElement="EAID_dst84019D_3E6C_424a_AACD_8319D1389BB9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AACD_8319D1389BB9" x="1850" y="392" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AACD_8319D1389BB9" x="1747" y="460" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AACD_8319D1389BB9" x="2004" y="387"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AACD_8319D1389BB9" x="1847" y="387"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AACD_8319D1389BB9" x="1735" y="717"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AACD_8319D1389BB9" x="1735" y="455"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AA23_2C9AD7E8E999" source="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_AA23_2C9AD7E8E999" text="+epo:concernsReviewSummaryForLot" modelElement="EAID_dstC46ECB_7950_4db1_AA23_2C9AD7E8E999">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="411" y="467" width="129" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="537" y="475" width="152" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_AA23_2C9AD7E8E999" text="1" modelElement="EAID_dstC46ECB_7950_4db1_AA23_2C9AD7E8E999">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="486" y="501" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="616" y="501" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="576" y="301"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AA23_2C9AD7E8E999" x="475" y="301"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AA23_2C9AD7E8E999" x="475" y="515"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AA23_2C9AD7E8E999" x="676" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AA23_2C9AD7E8E999" x="605" y="303"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AA23_2C9AD7E8E999" x="605" y="515"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B00A_CDF53D99CBCD" source="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" target="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" modelElement="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_B00A_CDF53D99CBCD" text="+epo:hasReviewIrregularitySummary" modelElement="EAID_dstEB89B4_BF73_4250_B00A_CDF53D99CBCD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="631" y="346" width="127" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="724" y="380" width="150" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_B00A_CDF53D99CBCD" text="0..*" modelElement="EAID_dstEB89B4_BF73_4250_B00A_CDF53D99CBCD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="708" y="378" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="808" y="402" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="700" y="338"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B00A_CDF53D99CBCD" x="700" y="396"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B00A_CDF53D99CBCD" x="800" y="347"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B00A_CDF53D99CBCD" x="800" y="420"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_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_AFC8_4f2d_B8A1_C090490D5878" x="1382" y="523"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B8A1_C090490D5878" x="1382" y="269"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B8A1_C090490D5878" x="1381" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B8A1_C090490D5878" x="1381" y="350"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_9DD7_3219683AAD0C" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_0CC18385_984E_4d4c_A942_07304CE66481" modelElement="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_9DD7_3219683AAD0C" x="1360" y="523"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9DD7_3219683AAD0C" x="1360" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9DD7_3219683AAD0C" x="1104" y="431"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9DD7_3219683AAD0C" x="1360" y="454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9DD7_3219683AAD0C" x="1138" y="454"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_9F41_FE45FA8A0605" source="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" target="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" modelElement="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_9F41_FE45FA8A0605" text="+epo:describesLotCompletion" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_9F41_FE45FA8A0605" x="342" y="689" width="118" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_9F41_FE45FA8A0605" x="535" y="611" width="118" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_9F41_FE45FA8A0605" text="1" modelElement="EAID_dstDB7A9B_1395_4587_9F41_FE45FA8A0605">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_9F41_FE45FA8A0605" x="411" y="673" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_9F41_FE45FA8A0605" x="606" y="578" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_9F41_FE45FA8A0605" x="2080" y="433"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9F41_FE45FA8A0605" x="2080" y="751"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9F41_FE45FA8A0605" x="399" y="751"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AFC8_4f2d_9F41_FE45FA8A0605" x="399" y="668"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_9F41_FE45FA8A0605" x="1580" y="746"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9F41_FE45FA8A0605" x="594" y="746"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9F41_FE45FA8A0605" x="594" y="573"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AB80_8F686D5C488E" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_AB80_8F686D5C488E" text="+epo:hasReviewRequestFee" modelElement="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AB80_8F686D5C488E" x="1671" y="482" width="91" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_AB80_8F686D5C488E" x="1646" y="476" width="14" height="114"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_AB80_8F686D5C488E" text="0..1" modelElement="EAID_dst0F07D8_06B8_43e0_AB80_8F686D5C488E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AB80_8F686D5C488E" x="1737" y="460" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_AB80_8F686D5C488E" x="1676" y="460" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AB80_8F686D5C488E" x="1592" y="589"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AB80_8F686D5C488E" x="1725" y="589"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AB80_8F686D5C488E" x="1725" y="455"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AB80_8F686D5C488E" x="1592" y="580"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AB80_8F686D5C488E" x="1664" y="580"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_AB80_8F686D5C488E" x="1664" y="455"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_88C5_0D1CAE6FE311" source="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" target="EAID_0CC18385_984E_4d4c_A942_07304CE66481" modelElement="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_88C5_0D1CAE6FE311" x="806" y="431"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_88C5_0D1CAE6FE311" x="1014" y="431"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_88C5_0D1CAE6FE311" x="906" y="454"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_88C5_0D1CAE6FE311" x="1048" y="454"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_AD24_2A89B4A5DAF1" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_0CC18385_984E_4d4c_A942_07304CE66481" modelElement="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AD24_2A89B4A5DAF1" x="1060" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AD24_2A89B4A5DAF1" x="1060" y="462"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_AD24_2A89B4A5DAF1" x="1085" y="539"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_AD24_2A89B4A5DAF1" x="1085" y="485"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_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_AFC8_4f2d_926C_444F368462AA" text="+epo:resolvesReviewRequest" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_926C_444F368462AA" x="1234" y="555" width="118" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_926C_444F368462AA" x="1234" y="564" width="118" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_926C_444F368462AA" text="1" modelElement="EAID_dst63763E_2F48_4952_926C_444F368462AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_926C_444F368462AA" x="1346" y="578" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_926C_444F368462AA" x="1346" y="587" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_926C_444F368462AA" x="1200" y="573"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_926C_444F368462AA" x="1354" y="573"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_926C_444F368462AA" x="1200" y="582"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_926C_444F368462AA" x="1354" y="582"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_A37A_DA236E1A8FE3" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" modelElement="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_A37A_DA236E1A8FE3" x="1026" y="578"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_A37A_DA236E1A8FE3" x="842" y="578"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_A37A_DA236E1A8FE3" x="1026" y="579"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_A37A_DA236E1A8FE3" x="897" y="579"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B7C6_33C21269E183" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_B7C6_33C21269E183" text="+epo:hasRemedyValue" modelElement="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_B7C6_33C21269E183" x="1662" y="427" width="71" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_B7C6_33C21269E183" x="1853" y="393" width="94" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_B7C6_33C21269E183" text="0..1" modelElement="EAID_dst3D1892_1403_4dcc_B7C6_33C21269E183">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_B7C6_33C21269E183" x="1715" y="460" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_B7C6_33C21269E183" x="1850" y="418" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B7C6_33C21269E183" x="1200" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B7C6_33C21269E183" x="1703" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_B7C6_33C21269E183" x="1703" y="455"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B7C6_33C21269E183" x="1067" y="609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B7C6_33C21269E183" x="1067" y="788"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_B7C6_33C21269E183" x="1924" y="788"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AFC8_4f2d_B7C6_33C21269E183" x="1924" y="413"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AFC8_4f2d_B7C6_33C21269E183" x="1847" y="413"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_B4E8_8A666E94C5BA" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" modelElement="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B4E8_8A666E94C5BA" x="1125" y="609"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B4E8_8A666E94C5BA" x="1125" y="698"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_B4E8_8A666E94C5BA" x="1224" y="698"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_B4E8_8A666E94C5BA" x="1091" y="609"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_B4E8_8A666E94C5BA" x="1091" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_B4E8_8A666E94C5BA" x="1224" y="689"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_85E1_1ABB6B9E21EB" source="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_AFC8_4f2d_85E1_1ABB6B9E21EB" text="+epo:refersToPreviousReview 0..1" modelElement="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1314" y="80" width="99" height="40"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1312" y="161" width="99" height="40"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_AFC8_4f2d_85E1_1ABB6B9E21EB" text="0..1" modelElement="EAID_dst33CDC7_EDE9_461d_85E1_1ABB6B9E21EB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1326" y="153" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1324" y="234" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1417" y="158"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1417" y="158"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1417" y="120"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1318" y="120"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1318" y="158"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1318" y="158"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1415" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1415" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1415" y="201"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1316" y="201"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1316" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_AFC8_4f2d_85E1_1ABB6B9E21EB" x="1316" y="239"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C31DC6F6_AFC8_4f2d_9640_5358E5CE90C3" source="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" target="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" modelElement="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_9640_5358E5CE90C3" x="1432" y="624"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9640_5358E5CE90C3" x="1432" y="692"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9640_5358E5CE90C3" x="1314" y="692"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_AFC8_4f2d_9640_5358E5CE90C3" x="1478" y="624"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_AFC8_4f2d_9640_5358E5CE90C3" x="1478" y="689"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_AFC8_4f2d_9640_5358E5CE90C3" x="1314" y="689"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<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="1034" y="303" width="121" height="61"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BF42_2A6E50CAF4E6" x="1009" y="302" width="171" height="61"/>
 			</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"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_AC62_FA4769B4D88C" x="474" y="512" width="112" height="38"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_AC62_FA4769B4D88C" x="464" y="512" width="112" height="38"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
@@ -7659,11 +8089,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_80B0_0C345D6703F4" x="79" y="487" width="278" height="111"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_80B0_0C345D6703F4" x="145" y="475" width="278" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_BE40_C921C05C776E" modelElement="EAID_93ACA540_2668_42d3_BE40_C921C05C776E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_BE40_C921C05C776E" text="epo:TenderGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BE40_C921C05C776E" x="1209" y="303" width="121" height="61"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BE40_C921C05C776E" x="1212" y="302" width="171" height="61"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
@@ -7673,16 +8103,13 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_BCD0_09D751D046C7" text="epo:ProcurementElement"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BCD0_09D751D046C7" x="576" y="74" width="174" height="85"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_B023DE7D_2242_4a87_8201_33A33284BEAA" modelElement="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_8201_33A33284BEAA" x="226" y="688" width="399" height="230"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_BD2A_3CD31A751F07" modelElement="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_BD2A_3CD31A751F07" text="epo:Purpose"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BD2A_3CD31A751F07" x="1224" y="417" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_BD2A_3CD31A751F07" x="1049" y="431" width="90" height="34"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_B023DE7D_2242_4a87_B901_B09C711333F4" modelElement="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2242_4a87_B901_B09C711333F4" text="epo:Project"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_B901_B09C711333F4" x="909" y="319" width="90" height="28"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2242_4a87_B901_B09C711333F4" x="901" y="320" width="90" height="28"/>
 			</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"/>
@@ -7690,22 +8117,18 @@
 			</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="1007" y="196" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8017_204CCE05A2CC" x="954" 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="1063" y="165" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8017_204CCE05A2CC" x="1010" y="165" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_8017_204CCE05A2CC" x="963" y="319"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8017_204CCE05A2CC" x="1065" y="161"/>
+				<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"/>
 			</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"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_A1C6_F384FEC304AE" x="623" y="159"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_BFBE_32CA1C1F5228" source="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_55FB6FB6_1605_4f39_BFBE_32CA1C1F5228">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_BFBE_32CA1C1F5228" x="403" y="688"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_BFBE_32CA1C1F5228" x="403" y="397"/>
-			</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"/>
@@ -7742,251 +8165,350 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_9649_6F7949D3D9BA" x="542" y="328"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_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_2242_4a87_A8A7_C0037581B6D3" x="264" y="487"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_A8A7_C0037581B6D3" x="340" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_A8A7_C0037581B6D3" x="316" y="475"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_A8A7_C0037581B6D3" x="350" y="397"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_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_2242_4a87_ADCE_908A980E0342" x="536" y="512"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_ADCE_908A980E0342" x="527" y="512"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_ADCE_908A980E0342" x="860" y="555"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_2242_4a87_ADCE_908A980E0342" x="895" y="555"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_2242_4a87_ADCE_908A980E0342" x="504" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_2242_4a87_ADCE_908A980E0342" x="503" y="397"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_B023DE7D_2242_4a87_841A_BB8035525574" source="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_67F11C76_D909_4610_841A_BB8035525574">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_2242_4a87_841A_BB8035525574" text="+adms:identifier" modelElement="EAID_dstF11C76_D909_4610_841A_BB8035525574">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_841A_BB8035525574" x="1191" y="194" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_2242_4a87_841A_BB8035525574" text="0..1" modelElement="EAID_dstF11C76_D909_4610_841A_BB8035525574">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_841A_BB8035525574" x="1189" y="166" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_841A_BB8035525574" x="1296" y="302"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_841A_BB8035525574" x="1177" y="161"/>
 			</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="1065" y="215" width="66" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_2242_4a87_8467_9DDA71E8D534" x="1024" 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="1106" y="166" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_2242_4a87_8467_9DDA71E8D534" x="1065" 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"/>
+			</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"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_2242_4a87_8467_9DDA71E8D534" x="1094" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_2242_4a87_8467_9DDA71E8D534" x="1094" y="161"/>
+				<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"/>
+				</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"/>
 			</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">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BAA8_68D1BF528FF5" x="560" y="290" width="232" height="185"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BAA8_68D1BF528FF5" x="612" y="422" width="249" height="185"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_98A6_28E358A11BEA" modelElement="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_98A6_28E358A11BEA" text="epo:StrategicProcurement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_98A6_28E358A11BEA" x="532" y="647" width="288" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_98A6_28E358A11BEA" x="643" y="780" width="288" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_A53A_502157F5F45A" x="1065" y="315" width="141" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_A53A_502157F5F45A" x="1134" y="456" width="141" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_80B0_0C345D6703F4" x="189" y="632" width="278" height="101"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_80B0_0C345D6703F4" x="133" y="748" width="278" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_A12E_00C2BE16F4B6" x="56" y="357" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_A12E_00C2BE16F4B6" x="125" y="489" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_B727_BC88B30CF43C" modelElement="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_B727_BC88B30CF43C" text="epo:ConcessionEstimate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B727_BC88B30CF43C" x="164" y="270" width="220" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B727_BC88B30CF43C" x="233" y="402" width="220" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_BAF3_ED8B1330B5E6" modelElement="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_BAF3_ED8B1330B5E6" text="epo:ContractSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BAF3_ED8B1330B5E6" x="1056" y="155" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BAF3_ED8B1330B5E6" x="1125" y="287" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_9330_A0C75730B97A" modelElement="EAID_495BBB92_468A_4f08_9330_A0C75730B97A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_9330_A0C75730B97A" text="epo:Fund"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_9330_A0C75730B97A" x="478" y="526" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_9330_A0C75730B97A" x="459" y="651" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_BD2A_3CD31A751F07" modelElement="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_BD2A_3CD31A751F07" text="epo:Purpose"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BD2A_3CD31A751F07" x="874" y="526" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BD2A_3CD31A751F07" x="943" y="658" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_B300_47B46651CA0A" modelElement="EAID_3780AA50_D898_4068_B300_47B46651CA0A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_B300_47B46651CA0A" text="epo:Technique"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B300_47B46651CA0A" x="1050" y="399" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B300_47B46651CA0A" x="1119" y="531" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_B1DF_AD05AE937E9D" modelElement="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_B1DF_AD05AE937E9D" text="epo:Term"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B1DF_AD05AE937E9D" x="799" y="155" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B1DF_AD05AE937E9D" x="868" y="287" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_AB49_BF3DDBFF4E66" modelElement="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9517_4c3c_AB49_BF3DDBFF4E66" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_AB49_BF3DDBFF4E66" text="at-voc:legal-basis"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_AB49_BF3DDBFF4E66" x="351" y="181" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_AB49_BF3DDBFF4E66" x="636" y="292" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_BCD0_09D751D046C7" modelElement="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_BCD0_09D751D046C7" text="epo:ProcurementElement"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BCD0_09D751D046C7" x="591" y="55" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_BCD0_09D751D046C7" x="650" y="191" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_AC62_FA4769B4D88C" x="320" y="526" width="115" height="43"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_AC62_FA4769B4D88C" x="261" y="651" width="115" height="43"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_8D25_BA714BA9C3EC" modelElement="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_8D25_BA714BA9C3EC" text="epo:Quantity"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_8D25_BA714BA9C3EC" x="1065" y="526" width="205" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_8D25_BA714BA9C3EC" x="1134" y="658" width="205" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_B311_4F37313BAEF6" modelElement="EAID_E55F2451_5826_4907_B311_4F37313BAEF6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9517_4c3c_B311_4F37313BAEF6" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_B311_4F37313BAEF6" text="at-voc:cpv"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B311_4F37313BAEF6" x="874" y="673" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_B311_4F37313BAEF6" x="943" y="805" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_9664_258E887283AF" x="1167" y="315"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9664_258E887283AF" x="1167" y="95"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_9664_258E887283AF" x="762" y="95"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_9AF4_B6398F78199C" modelElement="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9517_4c3c_9AF4_B6398F78199C" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_9AF4_B6398F78199C" text="at-voc:EU-programme"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_9AF4_B6398F78199C" x="540" y="769" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_AD7B_7484B8FDA398" text="adms:Identifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_AD7B_7484B8FDA398" x="423" y="865" width="207" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_1F377807_9517_4c3c_9B44_2FCDD6AB5C9D" modelElement="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9517_4c3c_9B44_2FCDD6AB5C9D" text="epo:MonetaryValue"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9517_4c3c_9B44_2FCDD6AB5C9D" x="203" y="99" width="267" height="88"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_91FB_B8F7B19FEB4B" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_91FB_B8F7B19FEB4B" text="+epo:contextualisedBy" modelElement="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_91FB_B8F7B19FEB4B" x="508" y="503" width="91" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_91FB_B8F7B19FEB4B" text="0..*" modelElement="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_91FB_B8F7B19FEB4B" x="593" y="526" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_91FB_B8F7B19FEB4B" x="296" y="521"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_91FB_B8F7B19FEB4B" x="612" y="521"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_A6E7_D6BCEF598E62" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" modelElement="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_A6E7_D6BCEF598E62" text="+epo:hasPurpose" modelElement="EAID_dst23E4D3_4706_4097_A6E7_D6BCEF598E62">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_A6E7_D6BCEF598E62" x="802" y="546" width="70" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_A6E7_D6BCEF598E62" x="871" y="678" width="70" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_A6E7_D6BCEF598E62" text="0..1" modelElement="EAID_dst23E4D3_4706_4097_A6E7_D6BCEF598E62">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_A6E7_D6BCEF598E62" x="855" y="569" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_A6E7_D6BCEF598E62" x="924" y="701" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A6E7_D6BCEF598E62" x="761" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A6E7_D6BCEF598E62" x="761" y="564"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A6E7_D6BCEF598E62" x="874" y="564"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A6E7_D6BCEF598E62" x="816" y="607"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A6E7_D6BCEF598E62" x="816" y="696"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A6E7_D6BCEF598E62" x="943" y="696"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_8BB6_681888ACB178" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" modelElement="EAID_0F625CFF_139F_4712_8BB6_681888ACB178">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_8BB6_681888ACB178" text="+epo:isFundedBy" modelElement="EAID_dst625CFF_139F_4712_8BB6_681888ACB178">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_8BB6_681888ACB178" x="554" y="492" width="70" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_8BB6_681888ACB178" x="645" y="672" width="70" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_8BB6_681888ACB178" text="0..*" modelElement="EAID_dst625CFF_139F_4712_8BB6_681888ACB178">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_8BB6_681888ACB178" x="597" y="508" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_8BB6_681888ACB178" x="633" y="691" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_8BB6_681888ACB178" x="589" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_8BB6_681888ACB178" x="589" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_8BB6_681888ACB178" x="692" y="607"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_8BB6_681888ACB178" x="692" y="686"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_8BB6_681888ACB178" x="630" y="686"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_A39E_E74480CCE1D0" text="+epo:foreseesContractSpecificTerm" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_A39E_E74480CCE1D0" x="1003" y="248" width="142" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_A39E_E74480CCE1D0" x="1072" y="380" width="142" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_A39E_E74480CCE1D0" text="0..*" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_A39E_E74480CCE1D0" x="1117" y="230" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_A39E_E74480CCE1D0" x="1186" y="362" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A39E_E74480CCE1D0" x="792" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A39E_E74480CCE1D0" x="1105" y="303"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A39E_E74480CCE1D0" x="1105" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A39E_E74480CCE1D0" x="861" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A39E_E74480CCE1D0" x="1174" y="435"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A39E_E74480CCE1D0" x="1174" y="357"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_9190_197D4A4F4C63" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9190_197D4A4F4C63" x="621" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9190_197D4A4F4C63" x="621" y="206"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_9190_197D4A4F4C63" x="441" y="206"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9190_197D4A4F4C63" x="681" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9190_197D4A4F4C63" x="681" y="352"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_826E_974C4A3AEF87" text="+epo:fulfillsStrategicProcurement" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_826E_974C4A3AEF87" x="617" y="608" width="133" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_826E_974C4A3AEF87" x="738" y="741" width="133" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_826E_974C4A3AEF87" text="0..*" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_826E_974C4A3AEF87" x="684" y="629" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_826E_974C4A3AEF87" x="805" y="762" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_826E_974C4A3AEF87" x="797" y="607"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_826E_974C4A3AEF87" x="797" y="780"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_AD37_79213AD539C8" x="489" y="156" width="221" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_AD37_79213AD539C8" x="473" y="177" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_826E_974C4A3AEF87" x="676" y="475"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_826E_974C4A3AEF87" x="676" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_AD37_79213AD539C8" x="627" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_AD37_79213AD539C8" x="627" y="172"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_AD37_79213AD539C8" x="470" y="172"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_A1C6_F384FEC304AE" x="676" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A1C6_F384FEC304AE" x="676" y="125"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A1C6_F384FEC304AE" x="735" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A1C6_F384FEC304AE" x="735" y="261"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_B751_1F0998CC86A7" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_3780AA50_D898_4068_B300_47B46651CA0A" modelElement="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_B751_1F0998CC86A7" text="+epo:usesTechnique" modelElement="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B751_1F0998CC86A7" x="966" y="410" width="83" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B751_1F0998CC86A7" x="1035" y="541" width="83" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_B751_1F0998CC86A7" text="0..*" modelElement="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B751_1F0998CC86A7" x="1031" y="435" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B751_1F0998CC86A7" x="1100" y="566" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B751_1F0998CC86A7" x="792" y="430"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B751_1F0998CC86A7" x="1050" y="430"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B751_1F0998CC86A7" x="861" y="561"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B751_1F0998CC86A7" x="1119" y="561"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_B5DE_D7ED82169378" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_B5DE_D7ED82169378" text="+epo:isSubjectToTerm" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B5DE_D7ED82169378" x="696" y="170" width="90" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_B54C_5FBB7973D2FA" text="+epo:foreseesConcession" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B54C_5FBB7973D2FA" x="468" y="425" width="102" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_B5DE_D7ED82169378" text="0..*" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B5DE_D7ED82169378" x="780" y="198" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_B54C_5FBB7973D2FA" text="0..1" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B54C_5FBB7973D2FA" x="456" y="449" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B5DE_D7ED82169378" x="728" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B5DE_D7ED82169378" x="728" y="193"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_B5DE_D7ED82169378" x="799" y="193"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B54C_5FBB7973D2FA" x="612" y="444"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B54C_5FBB7973D2FA" x="453" y="444"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_9649_6F7949D3D9BA" x="808" y="316" width="135" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_9649_6F7949D3D9BA" x="877" y="456" width="135" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_9649_6F7949D3D9BA" x="795" y="334" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_9649_6F7949D3D9BA" x="864" y="474" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9649_6F7949D3D9BA" x="1065" y="329"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9649_6F7949D3D9BA" x="792" y="329"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9649_6F7949D3D9BA" x="1134" y="469"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9649_6F7949D3D9BA" x="861" y="469"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_ADCE_908A980E0342" x="376" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_ADCE_908A980E0342" x="376" y="456"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_ADCE_908A980E0342" x="560" y="456"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_9664_258E887283AF" x="1236" y="456"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9664_258E887283AF" x="1236" y="231"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_9664_258E887283AF" x="821" y="231"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_89C8_D3FC52D7CF0C" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_3780AA50_D898_4068_B300_47B46651CA0A" modelElement="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_89C8_D3FC52D7CF0C" text="+epo:foreseesTechnique" modelElement="EAID_dst4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1085" y="364" width="99" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1155" y="496" width="99" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_89C8_D3FC52D7CF0C" text="0..*" modelElement="EAID_dst4516BD_7CD7_4f69_89C8_D3FC52D7CF0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1147" y="381" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1217" y="513" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1139" y="350"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_89C8_D3FC52D7CF0C" x="1139" y="399"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_89C8_D3FC52D7CF0C" x="1209" y="491"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_89C8_D3FC52D7CF0C" x="1209" y="531"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_A8A7_C0037581B6D3" x="253" y="632"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A8A7_C0037581B6D3" x="253" y="430"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A8A7_C0037581B6D3" x="560" y="430"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_B5DE_D7ED82169378" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_B5DE_D7ED82169378" text="+epo:isSubjectToTerm" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B5DE_D7ED82169378" x="765" y="302" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_B5DE_D7ED82169378" text="0..*" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B5DE_D7ED82169378" x="849" y="330" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B5DE_D7ED82169378" x="784" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B5DE_D7ED82169378" x="784" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_B5DE_D7ED82169378" x="868" y="325"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_9195_C96F98BD3349" x="291" y="598" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_9195_C96F98BD3349" x="242" y="723" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_9195_C96F98BD3349" x="387" y="574" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_9195_C96F98BD3349" x="338" y="699" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9195_C96F98BD3349" x="375" y="632"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9195_C96F98BD3349" x="375" y="569"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9195_C96F98BD3349" x="326" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9195_C96F98BD3349" x="326" y="694"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_91FB_B8F7B19FEB4B" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_91FB_B8F7B19FEB4B" text="+epo:contextualisedBy" modelElement="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_91FB_B8F7B19FEB4B" x="467" y="371" width="91" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_ADCE_908A980E0342" x="317" y="651"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_ADCE_908A980E0342" x="317" y="588"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_ADCE_908A980E0342" x="612" y="588"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_BA4A_4553057B7C23" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_BA4A_4553057B7C23" text="+epo:hasEstimatedBuyerConcessionRevenue" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_BA4A_4553057B7C23" x="218" y="205" width="14" height="180"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_91FB_B8F7B19FEB4B" text="0..*" modelElement="EAID_dst24A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_91FB_B8F7B19FEB4B" x="541" y="394" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_BA4A_4553057B7C23" text="0..1" modelElement="EAID_dst5EEDCE_0633_482d_BA4A_4553057B7C23">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_BA4A_4553057B7C23" x="290" y="195" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_BA4A_4553057B7C23" x="279" y="402"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_BA4A_4553057B7C23" x="279" y="187"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_8E1E_BF993F4D765A" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_8E1E_BF993F4D765A" text="+epo:hasEstimatedUserConcessionRevenue" modelElement="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_8E1E_BF993F4D765A" x="279" y="211" width="14" height="175"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_8E1E_BF993F4D765A" text="0..1" modelElement="EAID_dstD18452_424C_4f36_8E1E_BF993F4D765A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_8E1E_BF993F4D765A" x="313" y="192" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_8E1E_BF993F4D765A" x="301" y="402"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_8E1E_BF993F4D765A" x="301" y="187"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_A13E_A5E9A66D9379" source="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_A13E_A5E9A66D9379" text="+epo:hasConcessionEstimatedValue" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_A13E_A5E9A66D9379" x="347" y="205" width="14" height="145"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_91FB_B8F7B19FEB4B" x="227" y="389"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_91FB_B8F7B19FEB4B" x="560" y="389"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_A13E_A5E9A66D9379" text="0..1" modelElement="EAID_dstA6C38F_77C6_4480_A13E_A5E9A66D9379">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_A13E_A5E9A66D9379" x="375" y="192" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_A13E_A5E9A66D9379" x="363" y="402"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A13E_A5E9A66D9379" x="363" y="187"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_9E70_090B7DE95623" source="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9E70_090B7DE95623" x="1056" y="190"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9E70_090B7DE95623" x="889" y="190"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9E70_090B7DE95623" x="1125" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9E70_090B7DE95623" x="958" y="322"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_B03B_E256F94C76B5" source="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" target="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C" modelElement="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B03B_E256F94C76B5" x="584" y="721"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B03B_E256F94C76B5" x="584" y="769"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_957C_60FF1C08941F" source="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_ED25B2CF_BC4D_44e9_957C_60FF1C08941F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_957C_60FF1C08941F" text="+adms:identifier" modelElement="EAID_dst25B2CF_BC4D_44e9_957C_60FF1C08941F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_957C_60FF1C08941F" x="475" y="820" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_957C_60FF1C08941F" text="0..1" modelElement="EAID_dst25B2CF_BC4D_44e9_957C_60FF1C08941F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_957C_60FF1C08941F" x="517" y="847" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_957C_60FF1C08941F" x="509" y="721"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_957C_60FF1C08941F" x="509" y="865"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_ABF2_BA01D9E3FEE4" source="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" target="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" modelElement="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_ABF2_BA01D9E3FEE4" x="890" y="596"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_ABF2_BA01D9E3FEE4" x="890" y="673"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_ABF2_BA01D9E3FEE4" x="959" y="728"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_ABF2_BA01D9E3FEE4" x="959" y="805"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_8526_5A4910F24815" source="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" target="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" modelElement="EAID_74371426_1670_46df_8526_5A4910F24815">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_8526_5A4910F24815" x="955" y="596"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_8526_5A4910F24815" x="955" y="673"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_8526_5A4910F24815" x="1024" y="728"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_8526_5A4910F24815" x="1024" y="805"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_82E7_387507253B10" source="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" target="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" modelElement="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_82E7_387507253B10" text="+epo:hasTotalQuantity" modelElement="EAID_dstAE0CEF_3CD9_464a_82E7_387507253B10">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_82E7_387507253B10" x="968" y="541" width="93" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_82E7_387507253B10" x="1037" y="673" width="93" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_82E7_387507253B10" text="0..1" modelElement="EAID_dstAE0CEF_3CD9_464a_82E7_387507253B10">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_82E7_387507253B10" x="1046" y="566" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_82E7_387507253B10" x="1115" y="698" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_82E7_387507253B10" x="964" y="561"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_82E7_387507253B10" x="1065" y="561"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_82E7_387507253B10" x="1033" y="693"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_82E7_387507253B10" x="1134" y="693"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_B54C_5FBB7973D2FA" text="+epo:foreseesConcession" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_B54C_5FBB7973D2FA" x="399" y="293" width="102" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_9C87_1543CFCC17D9" source="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9517_4c3c_9C87_1543CFCC17D9" text="+epo:hasEstimatedValue" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9517_4c3c_9C87_1543CFCC17D9" x="490" y="121" width="101" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_B54C_5FBB7973D2FA" text="0..1" modelElement="EAID_dst203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_B54C_5FBB7973D2FA" x="387" y="317" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9517_4c3c_9C87_1543CFCC17D9" text="0..1" modelElement="EAID_dstA962A1_6ADC_4a69_9C87_1543CFCC17D9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9517_4c3c_9C87_1543CFCC17D9" x="473" y="145" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_B54C_5FBB7973D2FA" x="560" y="312"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_B54C_5FBB7973D2FA" x="384" y="312"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9517_4c3c_9C87_1543CFCC17D9" x="737" y="191"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_9C87_1543CFCC17D9" x="737" y="140"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_9C87_1543CFCC17D9" x="470" y="140"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_1F377807_9517_4c3c_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_9517_4c3c_A8A7_C0037581B6D3" x="197" y="748"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9517_4c3c_A8A7_C0037581B6D3" x="197" y="567"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9517_4c3c_A8A7_C0037581B6D3" x="612" y="567"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_AB634BF8_27DF_4150_83AB_3091E780E74A" isFrame="false" modelElement="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C">
@@ -8080,27 +8602,27 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_27DF_4150_B8A4_6F969F59938C" text="epo:Notice"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_27DF_4150_B8A4_6F969F59938C" x="787" y="111" width="245" height="150"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_80BE_9C778A0BA2A5" x="1827" y="743" width="132" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_878A_8035A42A43F9" text="+epo:involvesBuyer" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_878A_8035A42A43F9" x="397" y="630" width="80" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_80BE_9C778A0BA2A5" x="1948" y="770" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_878A_8035A42A43F9" text="0..*" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_878A_8035A42A43F9" x="436" y="662" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_80BE_9C778A0BA2A5" x="1824" y="603"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_80BE_9C778A0BA2A5" x="1824" y="765"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_80BE_9C778A0BA2A5" x="1967" y="765"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_878A_8035A42A43F9" x="688" y="548"/>
+				<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 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="1644" y="665" width="90" 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_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_8F66_FA023FA190E7" x="1690" y="608" 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_8F66_FA023FA190E7" x="463" y="848"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8F66_FA023FA190E7" x="1678" y="848"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_8F66_FA023FA190E7" x="1678" y="603"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8166_36C3538F2F3A" source="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" target="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" modelElement="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_8166_36C3538F2F3A" text="+epo:specifiesProcurementCriteriaSummary" modelElement="EAID_dst9BB27E_7F36_41c3_8166_36C3538F2F3A">
@@ -8149,41 +8671,48 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9939_FA613CEB5D22" x="633" y="573"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_9939_FA613CEB5D22" x="633" y="687"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_A8A7_C0037581B6D3" x="916" y="476"/>
-				<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 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_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_A5D7_18A876BF10CF" x="1998" y="923" width="84" height="14"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_AB2B_CBE8A5D24AC5" x="465" y="467" width="189" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_A5D7_18A876BF10CF" x="2065" y="946" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_AB2B_CBE8A5D24AC5" x="501" y="442" width="17" height="14"/>
 				</ownedElement>
-				<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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_AB2B_CBE8A5D24AC5" x="688" y="489"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_AB2B_CBE8A5D24AC5" x="489" y="489"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_AB2B_CBE8A5D24AC5" x="489" y="437"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_878A_8035A42A43F9" text="+epo:involvesBuyer" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_878A_8035A42A43F9" x="397" y="630" width="80" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_B0AA_8C6787D5DF46" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B0AA_8C6787D5DF46" text="+epo:signedByBuyer" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B0AA_8C6787D5DF46" x="350" y="788" width="83" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_878A_8035A42A43F9" text="0..*" modelElement="EAID_dst2D6DCC_5092_48cf_878A_8035A42A43F9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_878A_8035A42A43F9" x="436" y="662" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B0AA_8C6787D5DF46" text="0..*" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B0AA_8C6787D5DF46" x="386" y="770" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_878A_8035A42A43F9" x="688" y="548"/>
-				<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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B0AA_8C6787D5DF46" x="374" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B0AA_8C6787D5DF46" x="374" y="765"/>
 			</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_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_27DF_4150_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_80BE_9C778A0BA2A5" x="1827" y="743" width="132" 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_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_80BE_9C778A0BA2A5" x="1948" y="770" width="17" 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_80BE_9C778A0BA2A5" x="1824" y="603"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_80BE_9C778A0BA2A5" x="1824" y="765"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_80BE_9C778A0BA2A5" x="1967" y="765"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_ADCE_908A980E0342" x="1653" y="431"/>
@@ -8209,10 +8738,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_A411_E8DA312BC449" x="876" y="261"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_A411_E8DA312BC449" x="876" y="476"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_8AD5_971C71230DCF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8AD5_971C71230DCF" x="1032" y="240"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8AD5_971C71230DCF" x="1264" y="240"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_9B27_A7A4C7B70604" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_9B27_A7A4C7B70604" x="1032" y="173"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9B27_A7A4C7B70604" x="1264" y="173"/>
@@ -8221,16 +8746,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_9CF4_9285C5C0CCEC" x="1032" y="206"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9CF4_9285C5C0CCEC" x="1264" y="206"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_AB2B_CBE8A5D24AC5" x="465" y="467" width="189" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_AB2B_CBE8A5D24AC5" x="501" y="442" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_AB2B_CBE8A5D24AC5" x="688" y="489"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_AB2B_CBE8A5D24AC5" x="489" y="489"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_AB2B_CBE8A5D24AC5" x="489" y="437"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_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_27DF_4150_A8A7_C0037581B6D3" x="916" y="476"/>
+				<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">
@@ -8317,16 +8836,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_9116_A734400E6358" x="1316" y="453"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_9116_A734400E6358" x="1577" y="453"/>
 			</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="1644" y="665" width="90" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_AB634BF8_27DF_4150_A5D7_18A876BF10CF" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" modelElement="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_A5D7_18A876BF10CF" text="+epo:includesTender" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_A5D7_18A876BF10CF" x="1998" y="923" width="84" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_8F66_FA023FA190E7" x="1690" y="608" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_A5D7_18A876BF10CF" text="0..*" modelElement="EAID_dstE75552_13BB_48c2_A5D7_18A876BF10CF">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_A5D7_18A876BF10CF" x="2065" y="946" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_8F66_FA023FA190E7" x="463" y="848"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_8F66_FA023FA190E7" x="1678" y="848"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_27DF_4150_8F66_FA023FA190E7" x="1678" y="603"/>
+				<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">
@@ -8338,9 +8856,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B087_27A619B6C819" x="2194" y="628"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B087_27A619B6C819" x="2194" y="526"/>
 			</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 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_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_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_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">
@@ -8392,15 +8916,9 @@
 				<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_B0AA_8C6787D5DF46" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_27DF_4150_B0AA_8C6787D5DF46" text="+epo:signedByBuyer" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_27DF_4150_B0AA_8C6787D5DF46" x="350" y="788" width="83" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_27DF_4150_B0AA_8C6787D5DF46" text="0..*" modelElement="EAID_dst687C05_7D35_48ab_B0AA_8C6787D5DF46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_27DF_4150_B0AA_8C6787D5DF46" x="386" y="770" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_27DF_4150_B0AA_8C6787D5DF46" x="374" y="836"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_27DF_4150_B0AA_8C6787D5DF46" x="374" y="765"/>
+			<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">
@@ -8451,6 +8969,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_031E_41eb_B951_BAA8F8436033" x="158" y="252"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_031E_41eb_B951_BAA8F8436033" x="379" y="158"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_67528027_031E_41eb_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_031E_41eb_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_031E_41eb_B370_202D9A0110E0" x="505" y="207" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_031E_41eb_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_031E_41eb_B370_202D9A0110E0" x="572" y="237" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_031E_41eb_B370_202D9A0110E0" x="579" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_031E_41eb_B370_202D9A0110E0" x="579" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_031E_41eb_B370_202D9A0110E0" x="595" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_031E_41eb_B370_202D9A0110E0" x="595" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_031E_41eb_B370_202D9A0110E0" x="564" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_031E_41eb_B370_202D9A0110E0" x="564" y="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_031E_41eb_B370_202D9A0110E0" x="564" y="242"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_67528027_031E_41eb_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_031E_41eb_A3E1_A997E86942D2" x="453" y="242"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_031E_41eb_A3E1_A997E86942D2" x="453" y="158"/>
@@ -8531,11 +9064,11 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C3BE0EED_5148_49f7_8C11_F71753C30F8E" modelElement="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5148_49f7_8C11_F71753C30F8E" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5148_49f7_8C11_F71753C30F8E" text="at-voc:economic-operator-size"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5148_49f7_8C11_F71753C30F8E" x="1042" y="763" width="133" height="50"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5148_49f7_8C11_F71753C30F8E" x="1044" y="753" width="133" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C3BE0EED_5148_49f7_894E_2EFBAE78D71C" modelElement="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5148_49f7_894E_2EFBAE78D71C" text="epo:Business"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5148_49f7_894E_2EFBAE78D71C" x="722" y="753" width="202" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5148_49f7_894E_2EFBAE78D71C" x="726" y="743" width="202" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C3BE0EED_5148_49f7_ABBB_CBDD98065B7F" modelElement="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_5148_49f7_ABBB_CBDD98065B7F" text="enumeration"/>
@@ -8584,6 +9117,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5148_49f7_A3E1_A997E86942D2" x="794" y="387"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5148_49f7_A3E1_A997E86942D2" x="794" y="353"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_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_5148_49f7_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_B370_202D9A0110E0" x="322" y="395" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5148_49f7_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5148_49f7_B370_202D9A0110E0" x="383" y="447" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_B370_202D9A0110E0" x="425" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_B370_202D9A0110E0" x="425" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5148_49f7_B370_202D9A0110E0" x="425" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5148_49f7_B370_202D9A0110E0" x="357" y="412"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_5148_49f7_B370_202D9A0110E0" x="357" y="442"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_5148_49f7_B370_202D9A0110E0" x="386" y="442"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_5148_49f7_B370_202D9A0110E0" x="386" y="442"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_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_5148_49f7_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_AE66_986280A7B2F6" x="591" y="86" width="95" height="14"/>
@@ -8603,9 +9151,9 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5148_49f7_8164_044CE03A05CB" text="0..*" modelElement="EAID_dstABB55C_F52F_4373_8164_044CE03A05CB">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5148_49f7_8164_044CE03A05CB" x="688" y="77" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_8164_044CE03A05CB" x="386" y="514"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8164_044CE03A05CB" x="51" y="514"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5148_49f7_8164_044CE03A05CB" x="51" y="72"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_8164_044CE03A05CB" x="386" y="519"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8164_044CE03A05CB" x="54" y="519"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5148_49f7_8164_044CE03A05CB" x="54" y="72"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5148_49f7_8164_044CE03A05CB" x="717" y="72"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_9644_C85CAC550728" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_677B606B_352C_459b_9644_C85CAC550728">
@@ -8650,27 +9198,27 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_8D89_2DD66914E4DD" source="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" target="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" modelElement="EAID_610783CB_543D_493b_8D89_2DD66914E4DD">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_SEL000000_5148_49f7_8D89_2DD66914E4DD" text="+epo:isBeneficialOwnerOf" modelElement="EAID_src0783CB_543D_493b_8D89_2DD66914E4DD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBSEL000000_5148_49f7_8D89_2DD66914E4DD" x="792" y="717" width="105" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBSEL000000_5148_49f7_8D89_2DD66914E4DD" x="794" y="707" width="105" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_SML000000_5148_49f7_8D89_2DD66914E4DD" text="0..*" modelElement="EAID_src0783CB_543D_493b_8D89_2DD66914E4DD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBSML000000_5148_49f7_8D89_2DD66914E4DD" x="840" y="738" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBSML000000_5148_49f7_8D89_2DD66914E4DD" x="842" y="728" width="17" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5148_49f7_8D89_2DD66914E4DD" text="+epo:hasBeneficialOwner" modelElement="EAID_dst0783CB_543D_493b_8D89_2DD66914E4DD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_8D89_2DD66914E4DD" x="792" y="668" width="103" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_8D89_2DD66914E4DD" x="794" y="668" width="103" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5148_49f7_8D89_2DD66914E4DD" text="0..*" modelElement="EAID_dst0783CB_543D_493b_8D89_2DD66914E4DD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5148_49f7_8D89_2DD66914E4DD" x="804" y="650" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5148_49f7_8D89_2DD66914E4DD" x="806" y="650" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_8D89_2DD66914E4DD" x="831" y="753"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8D89_2DD66914E4DD" x="831" y="645"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_8D89_2DD66914E4DD" x="833" y="743"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8D89_2DD66914E4DD" x="833" y="645"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_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_5148_49f7_8A47_A62DAC97C6A3" x="924" y="788"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8A47_A62DAC97C6A3" x="1042" y="788"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_8A47_A62DAC97C6A3" x="928" y="778"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_8A47_A62DAC97C6A3" x="1044" y="778"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_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_5148_49f7_A3EE_819F014FE1AC" x="722" y="796"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_A3EE_819F014FE1AC" x="705" y="796"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5148_49f7_A3EE_819F014FE1AC" x="726" y="786"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5148_49f7_A3EE_819F014FE1AC" x="705" y="786"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5148_49f7_A3EE_819F014FE1AC" x="705" y="464"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5148_49f7_A3EE_819F014FE1AC" x="639" y="464"/>
 			</ownedElement>
@@ -8708,7 +9256,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C3BE0EED_5148_49f7_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_5148_49f7_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_B7C9_925B517BC914" x="283" y="304" width="90" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5148_49f7_B7C9_925B517BC914" x="279" y="302" width="90" height="27"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5148_49f7_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5148_49f7_B7C9_925B517BC914" x="282" y="342" width="17" height="14"/>
@@ -8765,11 +9313,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6162271_FBBA_470d_A129_C30771A9833F" modelElement="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_A129_C30771A9833F" text="cpov:ContactPoint"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_A129_C30771A9833F" x="465" y="65" width="197" height="141"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_A129_C30771A9833F" x="465" y="84" width="197" height="141"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6162271_FBBA_470d_A12E_00C2BE16F4B6" modelElement="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_A12E_00C2BE16F4B6" text="epo:AgentInRole"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_A12E_00C2BE16F4B6" x="825" y="116" width="171" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_A12E_00C2BE16F4B6" x="825" y="155" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6162271_FBBA_470d_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_AD7B_7484B8FDA398" text="adms:Identifier"/>
@@ -8784,7 +9332,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6162271_FBBA_470d_9655_04521F703750" modelElement="EAID_96B284C4_E759_4bad_9655_04521F703750">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_9655_04521F703750" text="epo:Buyer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_9655_04521F703750" x="1044" y="93" width="219" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_9655_04521F703750" x="1044" y="112" width="219" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_A6162271_FBBA_470d_A426_F3B02E584BAC" modelElement="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_A426_F3B02E584BAC" text="epo:AdHocChannel"/>
@@ -8798,15 +9346,15 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_FBBA_470d_81DD_DA4802D8A322" text="org:Organization"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_FBBA_470d_81DD_DA4802D8A322" x="96" y="325" width="253" height="124"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_AFEF_E5B428B672AA" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" modelElement="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_AFEF_E5B428B672AA" text="+epo:exposesChannel" modelElement="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_AFEF_E5B428B672AA" x="870" y="249" width="88" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_B7C9_925B517BC914" x="680" y="166" width="113" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_AFEF_E5B428B672AA" text="0..*" modelElement="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_AFEF_E5B428B672AA" x="919" y="272" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B7C9_925B517BC914" x="665" y="189" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_AFEF_E5B428B672AA" x="911" y="186"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_AFEF_E5B428B672AA" x="911" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B7C9_925B517BC914" x="825" y="184"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B7C9_925B517BC914" x="662" y="184"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_AD39_5BA2A66950B9" text="+cv:registeredAddress" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
@@ -8828,6 +9376,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_82ED_0BAA7D433501" x="349" y="387"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_82ED_0BAA7D433501" x="463" y="387"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_B370_202D9A0110E0" x="278" y="274" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B370_202D9A0110E0" x="321" y="320" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B370_202D9A0110E0" x="349" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B370_202D9A0110E0" x="349" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_B370_202D9A0110E0" x="372" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_FBBA_470d_B370_202D9A0110E0" x="372" y="292"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_FBBA_470d_B370_202D9A0110E0" x="313" y="292"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_FBBA_470d_B370_202D9A0110E0" x="313" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_FBBA_470d_B370_202D9A0110E0" x="313" y="325"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_AE66_986280A7B2F6" x="361" y="583" width="95" height="14"/>
@@ -8854,37 +9417,36 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_A6A9_A94ADE3ECB16" x="1034" y="471"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_A6A9_A94ADE3ECB16" x="940" y="360"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_B996_A8D529DA32A2" source="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_B996_A8D529DA32A2" text="+epo:hasEndpointIdentifier" modelElement="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_B996_A8D529DA32A2" x="671" y="564" width="109" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B996_A8D529DA32A2" text="0..*" modelElement="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B996_A8D529DA32A2" x="671" y="587" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B996_A8D529DA32A2" x="836" y="360"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B996_A8D529DA32A2" x="836" y="582"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_B996_A8D529DA32A2" x="668" y="582"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_82F3_D4CC50B411F4" text="+epo:hasPrimaryContactPoint" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_82F3_D4CC50B411F4" x="344" y="119" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_82F3_D4CC50B411F4" x="332" y="138" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_82F3_D4CC50B411F4" text="0..*" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_82F3_D4CC50B411F4" x="446" y="142" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_82F3_D4CC50B411F4" x="446" y="161" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_82F3_D4CC50B411F4" x="226" y="325"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_82F3_D4CC50B411F4" x="226" y="137"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_82F3_D4CC50B411F4" x="465" y="137"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_82F3_D4CC50B411F4" x="226" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_82F3_D4CC50B411F4" x="465" y="156"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_B7C9_925B517BC914" x="665" y="128" width="113" height="14"/>
+			<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="+cv:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_BD17_379180274988" x="538" y="273" width="49" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B7C9_925B517BC914" x="665" y="152" width="17" height="14"/>
+				<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"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_BD17_379180274988" x="563" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_BD17_379180274988" x="563" y="311"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_AFEF_E5B428B672AA" source="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" target="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" modelElement="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_AFEF_E5B428B672AA" text="+epo:exposesChannel" modelElement="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_AFEF_E5B428B672AA" x="870" y="249" width="88" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B7C9_925B517BC914" x="825" y="147"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B7C9_925B517BC914" x="662" y="147"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_AFEF_E5B428B672AA" text="0..*" modelElement="EAID_dst904936_FC7D_45f3_AFEF_E5B428B672AA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_AFEF_E5B428B672AA" x="919" y="272" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_AFEF_E5B428B672AA" x="911" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_AFEF_E5B428B672AA" x="911" y="290"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_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_FBBA_470d_ABED_4C9AC22FFF2A" text="+locn:addressID" modelElement="EAID_dstF7D14A_11BF_430e_ABED_4C9AC22FFF2A">
@@ -8903,16 +9465,16 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B3EE_963EFE7F14CA" text="0..*" modelElement="EAID_dstC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B3EE_963EFE7F14CA" x="1004" y="310" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B3EE_963EFE7F14CA" x="1163" y="178"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B3EE_963EFE7F14CA" x="1163" y="197"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B3EE_963EFE7F14CA" x="1163" y="305"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_B3EE_963EFE7F14CA" x="1001" y="305"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_A7B8_F5FEC69BBDA5" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" modelElement="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_A7B8_F5FEC69BBDA5" text="+epo:indicatesInvoiceeContactPoint" modelElement="EAID_dst812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="665" y="83" width="143" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="677" y="102" width="143" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_A7B8_F5FEC69BBDA5" x="1044" y="101"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_A7B8_F5FEC69BBDA5" x="662" y="101"/>
+				<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"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_A3E6_EF880E1787DD" source="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" target="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" modelElement="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_A3E6_EF880E1787DD" x="911" y="471"/>
@@ -8929,15 +9491,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_925C_C2404C3C5805" x="1164" y="336"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_925C_C2404C3C5805" x="1001" y="336"/>
 			</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="+cv:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_BD17_379180274988" x="507" y="293" width="49" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_A6162271_FBBA_470d_B996_A8D529DA32A2" source="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_FBBA_470d_B996_A8D529DA32A2" text="+epo:hasEndpointIdentifier" modelElement="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_FBBA_470d_B996_A8D529DA32A2" x="671" y="564" width="109" 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"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_FBBA_470d_B996_A8D529DA32A2" text="0..*" modelElement="EAID_dst6DDC19_B837_4e3f_B996_A8D529DA32A2">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_FBBA_470d_B996_A8D529DA32A2" x="671" y="587" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_BD17_379180274988" x="563" y="206"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_BD17_379180274988" x="563" y="311"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_FBBA_470d_B996_A8D529DA32A2" x="836" y="360"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_FBBA_470d_B996_A8D529DA32A2" x="836" y="582"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_FBBA_470d_B996_A8D529DA32A2" x="668" y="582"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_F4E49053_6DAE_4623_8769_61637C57A452" isFrame="false" modelElement="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF">
@@ -9006,7 +9569,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F4E49053_6DAE_4623_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_6DAE_4623_B7C9_925B517BC914" text="+epo:hasContactPointInRole" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DAE_4623_B7C9_925B517BC914" x="450" y="121" width="90" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DAE_4623_B7C9_925B517BC914" x="431" y="133" width="113" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DAE_4623_B7C9_925B517BC914" text="0..*" modelElement="EAID_dst6E629B_BECA_4e04_B7C9_925B517BC914">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DAE_4623_B7C9_925B517BC914" x="530" y="163" width="17" height="14"/>
@@ -9117,9 +9680,24 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DAE_4623_82ED_0BAA7D433501" x="1091" y="358"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DAE_4623_82ED_0BAA7D433501" x="1091" y="210"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F4E49053_6DAE_4623_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_6DAE_4623_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DAE_4623_B370_202D9A0110E0" x="1128" y="322" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DAE_4623_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DAE_4623_B370_202D9A0110E0" x="1159" y="353" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_6DAE_4623_B370_202D9A0110E0" x="1182" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_6DAE_4623_B370_202D9A0110E0" x="1182" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_6DAE_4623_B370_202D9A0110E0" x="1201" y="367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_6DAE_4623_B370_202D9A0110E0" x="1201" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_6DAE_4623_B370_202D9A0110E0" x="1151" y="336"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_6DAE_4623_B370_202D9A0110E0" x="1151" y="358"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_6DAE_4623_B370_202D9A0110E0" x="1151" y="358"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_F4E49053_6DAE_4623_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_6DAE_4623_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DAE_4623_A6DF_915A5FB0B3DB" x="1021" y="490" width="51" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_6DAE_4623_A6DF_915A5FB0B3DB" x="1022" y="494" width="51" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_6DAE_4623_A6DF_915A5FB0B3DB" text="0..1" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_6DAE_4623_A6DF_915A5FB0B3DB" x="1029" y="474" width="17" height="14"/>
@@ -9169,7 +9747,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_844D_DCAF96861695" modelElement="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_844D_DCAF96861695" text="epo-ord:Consignee"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_844D_DCAF96861695" x="729" y="1339" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_844D_DCAF96861695" x="745" y="1339" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_AC0A_DF93BCB884C6" modelElement="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_AC0A_DF93BCB884C6" text="epo:Invoicer"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_AC0A_DF93BCB884C6" x="1555" y="1221" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_8EF3_D893D4201BD3" modelElement="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_8EF3_D893D4201BD3" text="epo-ful:Despatcher"/>
@@ -9252,7 +9834,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_9A5C_0F684174C4AC" x="1172" y="903" width="102" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD5F6935_1F48_4857_912A_3F8915E3704C" modelElement="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_912A_3F8915E3704C" x="550" y="1191" width="132" height="149"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_912A_3F8915E3704C" x="584" y="1186" width="170" height="112"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_CD5F6935_1F48_4857_94EC_172DCDA4EF78" modelElement="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1F48_4857_94EC_172DCDA4EF78" text="epo:BudgetProvider"/>
@@ -9345,13 +9927,17 @@
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_CD5F6935_1F48_4857_BB3D_C50E4CF84E8D" modelElement="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D">
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_BB3D_C50E4CF84E8D" x="1260" y="461" width="171" height="59"/>
 			</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"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1F48_4857_99E7_B387A7B402A1" x="2271" y="457" width="90" height="70"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_B95F_F02462CDAB9B" source="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" target="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" modelElement="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B95F_F02462CDAB9B" x="1470" y="1349"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B95F_F02462CDAB9B" x="1470" y="1291"/>
 			</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="1839" y="875"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A43E_D33DC6607852" x="1563" y="616"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BE6A_D4FA2FE59843" source="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843">
+				<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_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="988" y="1186"/>
@@ -9377,17 +9963,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B80A_3B15D5AAC373" x="1130" y="1255"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B80A_3B15D5AAC373" x="736" y="635"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BE6A_D4FA2FE59843" source="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" target="EAID_96B284C4_E759_4bad_9655_04521F703750" modelElement="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843">
-				<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 xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A514_24983E4F5D47" source="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" target="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" modelElement="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A514_24983E4F5D47" x="1150" y="1020"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A514_24983E4F5D47" x="1188" y="938"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8AA2_734EB60E8CFB" source="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8AA2_734EB60E8CFB" x="219" y="910"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8AA2_734EB60E8CFB" x="664" y="631"/>
+			<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="1534" y="1162"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BC18_F6B8F5B8635B" x="1529" y="616"/>
 			</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="665" y="1093"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9F94_6783892A6027" x="703" y="635"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9B1E_CDA9640E018F" source="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" target="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6" modelElement="EAID_6B97ADD1_0B83_48d4_9B1E_CDA9640E018F">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9B1E_CDA9640E018F" x="1598" y="1328"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9B1E_CDA9640E018F" x="1599" y="1291"/>
+			</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="316" y="902"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B8FD_2F0BC50DFCA9" x="664" y="634"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_ACD6_B0600D8325F5" source="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" target="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" modelElement="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_ACD6_B0600D8325F5" x="666" y="1464"/>
@@ -9395,7 +9985,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_94AD_A6E1847A6463" source="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" target="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" modelElement="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_94AD_A6E1847A6463" x="666" y="1369"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_94AD_A6E1847A6463" x="729" y="1367"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_94AD_A6E1847A6463" x="745" y="1366"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8B11_0F74ABE52935" source="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_70DB7081_2834_461e_8B11_0F74ABE52935">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8B11_0F74ABE52935" x="1880" y="707"/>
@@ -9405,8 +9995,12 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BDBC_A13B860A4535" x="1469" y="1221"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BDBC_A13B860A4535" x="1523" y="616"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_9499_790E7FC8DE86" source="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6" target="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" modelElement="EAID_8810653B_DB4F_443e_9499_790E7FC8DE86">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9499_790E7FC8DE86" x="1596" y="1221"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9499_790E7FC8DE86" x="1534" y="616"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_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_1F48_4857_8ABC_CDD0FA9EF71E" x="767" y="1339"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8ABC_CDD0FA9EF71E" x="782" y="1339"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8ABC_CDD0FA9EF71E" x="712" y="635"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_B9C6_7721498D7537" source="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537">
@@ -9429,13 +10023,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_B4C0_912C9C11EC4E" x="1377" y="1098"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B4C0_912C9C11EC4E" x="1508" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A514_24983E4F5D47" source="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" target="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" modelElement="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A514_24983E4F5D47" x="1150" y="1020"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A514_24983E4F5D47" x="1188" y="938"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_8AA2_734EB60E8CFB" source="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" target="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" modelElement="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8AA2_734EB60E8CFB" x="219" y="910"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8AA2_734EB60E8CFB" x="664" y="631"/>
 			</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="293" y="1170"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9BF3_BDFF0776A54C" x="682" y="635"/>
+			<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="1981" y="829"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_913E_EAEE25BEEAD8" x="1996" y="616"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_ACBC_32A0FFC18B3B" source="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_ACBC_32A0FFC18B3B" x="2309" y="734"/>
@@ -9449,6 +10043,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_9877_03C8FEE30681" x="1378" y="689"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9877_03C8FEE30681" x="1486" y="612"/>
 			</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="2271" y="504"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BF7D_068AAD2C5033" x="2043" y="568"/>
+			</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="1691" y="675"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AEF4_9EBDE5851B98" x="1576" y="610"/>
@@ -9477,21 +10075,21 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_8D62_CB3A9307E408" x="174" 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_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="225" y="818"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C9C_A94EFF7F2822" x="664" y="620"/>
+			<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="1839" y="875"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A43E_D33DC6607852" x="1563" y="616"/>
 			</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="1534" y="1162"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BC18_F6B8F5B8635B" x="1529" y="616"/>
+			<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="620" y="1013"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AC39_5B5D4DC0AF5F" x="701" 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="1981" y="829"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_913E_EAEE25BEEAD8" x="1996" y="616"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BD4B_CD5FBBA367E4" source="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BD4B_CD5FBBA367E4" x="2382" y="563"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BD4B_CD5FBBA367E4" x="2043" y="578"/>
 			</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="316" y="902"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_B8FD_2F0BC50DFCA9" x="664" y="634"/>
+			<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="293" y="1170"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9BF3_BDFF0776A54C" x="682" 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"/>
@@ -9522,8 +10120,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C59_831A976F33D2" x="690" y="635"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_A302_795332661BE4" source="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" target="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" modelElement="EAID_33CADDC4_3A87_4925_A302_795332661BE4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A302_795332661BE4" x="606" y="1191"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A302_795332661BE4" x="627" y="1128"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A302_795332661BE4" x="636" y="1186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A302_795332661BE4" x="636" y="1128"/>
 			</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="1206" y="903"/>
@@ -9533,13 +10131,13 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_A409_64CB2CE61248" x="1662" y="1162"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_A409_64CB2CE61248" x="1538" y="616"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CD5F6935_1F48_4857_BD4B_CD5FBBA367E4" source="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1F48_4857_BD4B_CD5FBBA367E4" x="2382" y="563"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_BD4B_CD5FBBA367E4" x="2043" y="578"/>
+			<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="665" y="1093"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_9F94_6783892A6027" x="703" y="635"/>
 			</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="620" y="1013"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_AC39_5B5D4DC0AF5F" x="701" 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="225" y="818"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1F48_4857_8C9C_A94EFF7F2822" x="664" y="620"/>
 			</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">
@@ -9603,7 +10201,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6B773B07_0005_44a3_B584_D95C2DBBD7A1" modelElement="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0005_44a3_B584_D95C2DBBD7A1" text="foaf:Agent"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_B584_D95C2DBBD7A1" x="697" y="85" width="164" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_B584_D95C2DBBD7A1" x="697" y="56" width="164" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6B773B07_0005_44a3_B61A_99942ED53255" modelElement="EAID_BCFFD008_5189_4d53_B61A_99942ED53255">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0005_44a3_B61A_99942ED53255" text="epo:AcquiringParty"/>
@@ -9624,12 +10222,20 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6B773B07_0005_44a3_957E_CAC97A45CD53" modelElement="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0005_44a3_957E_CAC97A45CD53" text="foaf:Person"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_957E_CAC97A45CD53" x="217" y="85" width="90" height="35"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_957E_CAC97A45CD53" x="433" y="68" width="90" height="35"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_B80A_3B15D5AAC373" x="747" y="432"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B80A_3B15D5AAC373" x="747" y="361"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_B80A_3B15D5AAC373" x="543" y="361"/>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6B773B07_0005_44a3_AE42_0583F7417A79" modelElement="EAID_17662AEF_1321_446a_AE42_0583F7417A79">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0005_44a3_AE42_0583F7417A79" text="epo-not:CompetitionNotice"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_AE42_0583F7417A79" x="118" y="180" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6B773B07_0005_44a3_B54C_B6CDF1726225" modelElement="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_0005_44a3_B54C_B6CDF1726225" text="cpv:Person"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_0005_44a3_B54C_B6CDF1726225" x="158" y="22" width="209" height="127"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_8ACE_0CBB68152882" x="224" y="514"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_8ACE_0CBB68152882" x="224" y="453"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_8ACE_0CBB68152882" x="368" y="453"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_A6DF_915A5FB0B3DB" text="+epo:leadBy" modelElement="EAID_dstF440DD_AB87_4730_A6DF_915A5FB0B3DB">
@@ -9655,6 +10261,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_BB86_A2E25524B058" x="1034" y="306"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_BB86_A2E25524B058" x="934" y="306"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_AA92_BB00BFD1DB22" source="EAID_17662AEF_1321_446a_AE42_0583F7417A79" target="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" modelElement="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0005_44a3_AA92_BB00BFD1DB22" text="+epo:announcesRole" modelElement="EAID_dst476D87_C25E_439e_AA92_BB00BFD1DB22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_AA92_BB00BFD1DB22" x="305" y="197" width="84" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0005_44a3_AA92_BB00BFD1DB22" text="1..*" modelElement="EAID_dst476D87_C25E_439e_AA92_BB00BFD1DB22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_AA92_BB00BFD1DB22" x="372" y="220" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_AA92_BB00BFD1DB22" x="208" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_AA92_BB00BFD1DB22" x="391" y="215"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_A0DE_6D0C5CD5A716" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" modelElement="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_A0DE_6D0C5CD5A716" x="367" y="85"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A0DE_6D0C5CD5A716" x="433" y="85"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_A514_24983E4F5D47" source="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" target="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" modelElement="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_A514_24983E4F5D47" x="175" y="617"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A514_24983E4F5D47" x="341" y="476"/>
@@ -9679,37 +10299,52 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_BBA1_4FFA393BE7FA" x="731" y="492"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_A3E1_A997E86942D2" x="787" y="213"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A3E1_A997E86942D2" x="787" y="170"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_A3E1_A997E86942D2" x="786" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A3E1_A997E86942D2" x="786" y="141"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_811D_F82085D6A825" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" modelElement="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_811D_F82085D6A825" x="866" y="327"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_811D_F82085D6A825" x="866" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_811D_F82085D6A825" x="1054" y="357"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_B370_202D9A0110E0" x="614" y="170" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0005_44a3_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_B370_202D9A0110E0" x="678" y="240" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_B370_202D9A0110E0" x="717" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B370_202D9A0110E0" x="717" y="213"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_B370_202D9A0110E0" x="717" y="188"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_0005_44a3_B370_202D9A0110E0" x="652" y="188"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_0005_44a3_B370_202D9A0110E0" x="652" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_0005_44a3_B370_202D9A0110E0" x="681" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_0005_44a3_B370_202D9A0110E0" x="681" y="235"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_A266_DDF9F55EABCE" x="477" y="346"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A266_DDF9F55EABCE" x="477" y="251"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_8887_BFF48DC77200" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" modelElement="EAID_15FE118D_5443_4723_8887_BFF48DC77200">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_8887_BFF48DC77200" x="865" y="213"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_8887_BFF48DC77200" x="865" y="173"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_8887_BFF48DC77200" x="1041" y="173"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_A266_DDF9F55EABCE" x="476" y="346"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_A266_DDF9F55EABCE" x="477" y="251"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_B951_BAA8F8436033" source="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_B951_BAA8F8436033" x="523" y="88"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B951_BAA8F8436033" x="697" y="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_BCE2_05E832F758D6" text="+epo:playedBy" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_BCE2_05E832F758D6" x="630" y="120" width="61" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_BCE2_05E832F758D6" x="630" y="109" width="61" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0005_44a3_BCE2_05E832F758D6" text="1" modelElement="EAID_dst9200E2_D732_4a5e_BCE2_05E832F758D6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_BCE2_05E832F758D6" x="689" y="144" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_BCE2_05E832F758D6" x="689" y="133" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_BCE2_05E832F758D6" x="478" y="179"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_BCE2_05E832F758D6" x="478" y="139"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_BCE2_05E832F758D6" x="697" y="139"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_BCE2_05E832F758D6" x="472" y="179"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_BCE2_05E832F758D6" x="472" y="128"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_BCE2_05E832F758D6" x="697" y="128"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_B951_BAA8F8436033" source="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" target="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" modelElement="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_B951_BAA8F8436033" x="307" y="101"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B951_BAA8F8436033" x="697" y="101"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_B80A_3B15D5AAC373" x="747" y="432"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B80A_3B15D5AAC373" x="747" y="361"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_B80A_3B15D5AAC373" x="543" y="361"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
@@ -9734,7 +10369,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_AB2B_CBE8A5D24AC5" text="+epo:isExecutedByProcurementServiceProvider" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_AB2B_CBE8A5D24AC5" x="753" y="541" width="166" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_AB2B_CBE8A5D24AC5" x="725" y="546" width="189" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0005_44a3_AB2B_CBE8A5D24AC5" text="0..1" modelElement="EAID_dst460B26_E1D3_4c16_AB2B_CBE8A5D24AC5">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_AB2B_CBE8A5D24AC5" x="833" y="509" width="17" height="14"/>
@@ -9769,25 +10404,25 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_9AF0_B6AC86597613" x="217" y="365"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_9AF0_B6AC86597613" x="100" y="365"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_B85A_672AACE795E2" source="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" target="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" modelElement="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_B85A_672AACE795E2" source="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" target="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" modelElement="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_0005_44a3_B85A_672AACE795E2" text="+epo:playedBy" modelElement="EAID_dstD7352D_80E6_41e6_B85A_672AACE795E2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_B85A_672AACE795E2" x="234" y="145" width="61" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_0005_44a3_B85A_672AACE795E2" x="234" y="174" width="61" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_0005_44a3_B85A_672AACE795E2" text="0..1" modelElement="EAID_dstD7352D_80E6_41e6_B85A_672AACE795E2">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_B85A_672AACE795E2" x="274" y="125" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_0005_44a3_B85A_672AACE795E2" x="274" y="154" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_B85A_672AACE795E2" x="262" y="277"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B85A_672AACE795E2" x="262" y="120"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_B85A_672AACE795E2" x="262" y="149"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_AC39_5B5D4DC0AF5F" x="307" y="296"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_AC39_5B5D4DC0AF5F" x="476" y="296"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_AC39_5B5D4DC0AF5F" x="476" y="346"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_AC39_5B5D4DC0AF5F" x="307" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_AC39_5B5D4DC0AF5F" x="441" y="295"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_AC39_5B5D4DC0AF5F" x="441" y="346"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_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_0005_44a3_8ACE_0CBB68152882" x="224" y="514"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_8ACE_0CBB68152882" x="224" y="453"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_8ACE_0CBB68152882" x="368" y="453"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6B773B07_0005_44a3_811D_F82085D6A825" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" modelElement="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_0005_44a3_811D_F82085D6A825" x="866" y="327"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_0005_44a3_811D_F82085D6A825" x="866" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_0005_44a3_811D_F82085D6A825" x="1054" y="357"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_DC637555_D382_4357_B324_6181AAA46DCE" isFrame="false" modelElement="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC">
@@ -9855,6 +10490,21 @@
 				<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>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_D382_4357_B370_202D9A0110E0" x="483" y="239" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_D382_4357_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_D382_4357_B370_202D9A0110E0" x="550" y="294" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_D382_4357_B370_202D9A0110E0" x="572" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_D382_4357_B370_202D9A0110E0" x="572" y="277"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_D382_4357_B370_202D9A0110E0" x="572" y="258"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_D382_4357_B370_202D9A0110E0" x="529" y="258"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_D382_4357_B370_202D9A0110E0" x="529" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_D382_4357_B370_202D9A0110E0" x="553" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_D382_4357_B370_202D9A0110E0" x="553" y="289"/>
+			</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"/>
@@ -9994,7 +10644,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_347C0768_29F9_4a87_A129_C30771A9833F" modelElement="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_29F9_4a87_A129_C30771A9833F" text="cpov:ContactPoint"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_29F9_4a87_A129_C30771A9833F" x="1167" y="559" width="197" height="141"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_29F9_4a87_A129_C30771A9833F" x="1167" y="544" width="197" height="141"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_347C0768_29F9_4a87_BA64_B05755E636F2" modelElement="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_29F9_4a87_BA64_B05755E636F2" text="epo:ContractTerm"/>
@@ -10002,7 +10652,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_347C0768_29F9_4a87_8108_0018817C75BD" modelElement="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_29F9_4a87_8108_0018817C75BD" text="epo:OpeningTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_29F9_4a87_8108_0018817C75BD" x="1149" y="193" width="223" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_29F9_4a87_8108_0018817C75BD" x="1139" y="193" width="223" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_347C0768_29F9_4a87_8FE5_C4EE73295C40" modelElement="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_29F9_4a87_8FE5_C4EE73295C40" text="enumeration"/>
@@ -10098,23 +10748,23 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_BD17_379180274988" text="+cv:address" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_BD17_379180274988" x="959" y="435" width="49" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_BD17_379180274988" x="980" y="458" width="49" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_29F9_4a87_BD17_379180274988" text="0..1" modelElement="EAID_dst228FCF_2B3C_44e6_BD17_379180274988">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_BD17_379180274988" x="959" y="458" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_BD17_379180274988" x="981" y="434" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_BD17_379180274988" x="1167" y="575"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_BD17_379180274988" x="956" y="453"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_BD17_379180274988" x="1167" y="551"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_BD17_379180274988" x="956" y="437"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_98A5_58BD6A43131C" text="+epo:definesOpeningPlace" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_98A5_58BD6A43131C" x="943" y="273" width="85" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_98A5_58BD6A43131C" x="976" y="289" width="108" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_29F9_4a87_98A5_58BD6A43131C" text="0..1" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_98A5_58BD6A43131C" x="959" y="329" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_98A5_58BD6A43131C" x="959" y="330" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_98A5_58BD6A43131C" x="1149" y="253"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_98A5_58BD6A43131C" x="956" y="324"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_98A5_58BD6A43131C" x="1139" y="259"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_98A5_58BD6A43131C" x="956" y="325"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_B8AA_9EA312803C2B" source="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" target="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" modelElement="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_B8AA_9EA312803C2B" x="751" y="721"/>
@@ -10123,13 +10773,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_82F3_D4CC50B411F4" text="+epo:hasPrimaryContactPoint" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_82F3_D4CC50B411F4" x="1205" y="524" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_82F3_D4CC50B411F4" x="1205" y="509" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_29F9_4a87_82F3_D4CC50B411F4" text="0..*" modelElement="EAID_dstD44282_10C8_422c_82F3_D4CC50B411F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_82F3_D4CC50B411F4" x="1272" y="541" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_82F3_D4CC50B411F4" x="1272" y="526" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_82F3_D4CC50B411F4" x="1264" y="455"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_82F3_D4CC50B411F4" x="1264" y="559"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_82F3_D4CC50B411F4" x="1264" y="544"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_AD39_5BA2A66950B9" text="+cv:registeredAddress" modelElement="EAID_dst50E4FC_E8DA_47c5_AD39_5BA2A66950B9">
@@ -10151,6 +10801,20 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_82ED_0BAA7D433501" x="1139" y="389"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_82ED_0BAA7D433501" x="956" y="389"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_B370_202D9A0110E0" text="+org:subOrganizationOf 0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_B370_202D9A0110E0" x="1405" y="407" width="115" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_29F9_4a87_B370_202D9A0110E0" text="0..*" modelElement="EAID_dstF93267_E672_481d_B370_202D9A0110E0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_29F9_4a87_B370_202D9A0110E0" x="1395" y="399" width="100" height="10"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_29F9_4a87_B370_202D9A0110E0" x="1392" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_29F9_4a87_B370_202D9A0110E0" x="1392" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_29F9_4a87_B370_202D9A0110E0" x="1425" y="428"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_29F9_4a87_B370_202D9A0110E0" x="1425" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_29F9_4a87_B370_202D9A0110E0" x="1392" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_29F9_4a87_B370_202D9A0110E0" x="1392" y="394"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_347C0768_29F9_4a87_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_29F9_4a87_AE66_986280A7B2F6" text="+epo:hasLegalIdentifier" modelElement="EAID_dst57F338_A3A5_457d_AE66_986280A7B2F6">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_29F9_4a87_AE66_986280A7B2F6" x="962" y="104" width="95" height="14"/>
@@ -10242,7 +10906,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_8DE2_A3943CDEC6CA" modelElement="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_8DE2_A3943CDEC6CA" text="epo:SubmissionTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_8DE2_A3943CDEC6CA" x="925" y="557" width="330" height="215"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_8DE2_A3943CDEC6CA" x="925" y="576" width="330" height="215"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_BAB3_9047B4874154" modelElement="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_BAB3_9047B4874154" text="epo:MultipleStageProcedureTerm"/>
@@ -10254,7 +10918,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_835A_24C87816F40C" x="85" y="598" width="261" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_835A_24C87816F40C" x="41" y="587" width="261" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_9EC7_90D2BE971F58" modelElement="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_9EC7_90D2BE971F58" text="epo:AccessTerm"/>
@@ -10266,7 +10930,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_A10D_2BA34123A366" modelElement="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_A10D_2BA34123A366" text="epo:ParticipationRequestTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_A10D_2BA34123A366" x="220" y="707" width="113" height="52"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B272_4c8d_A10D_2BA34123A366" x="180" y="719" width="153" height="52"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_B8D5_38C02E2C8998" modelElement="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B272_4c8d_B8D5_38C02E2C8998" text="epo:SecurityClearanceTerm"/>
@@ -10290,11 +10954,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5E50B73B_B272_4c8d_95D1_9F9A3F8B34D8" modelElement="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
 				<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="823" y="466" width="256" height="75"/>
+				<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="346" y="600"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_982A_26607071A85E" x="605" y="489"/>
+				<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_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"/>
@@ -10315,8 +10979,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_80BE_9C778A0BA2A5" x="644" y="437"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_A5CD_27AE1D84CDDE" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A5CD_27AE1D84CDDE" x="340" y="785"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A5CD_27AE1D84CDDE" x="622" y="489"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A5CD_27AE1D84CDDE" x="341" y="785"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A5CD_27AE1D84CDDE" x="623" y="489"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_8A8A_E03C23ED1BE1" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_8A8A_E03C23ED1BE1" x="1215" y="880"/>
@@ -10334,8 +10998,8 @@
 				<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="589"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A104_F62859765981" x="688" y="483"/>
+				<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"/>
@@ -10346,8 +11010,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_8335_7F9768E9C57B" x="657" y="489"/>
 			</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="392" y="923"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A633_615CD23835C1" x="634" y="489"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_A633_615CD23835C1" x="387" y="923"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_A633_615CD23835C1" x="629" y="489"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_B910_6C37C39CAAFC" source="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_B910_6C37C39CAAFC" x="805" y="953"/>
@@ -10362,12 +11026,12 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_84EA_F015F6FE1271" x="598" y="470"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_921A_A4E96D0B2738" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_B3295353_448F_433c_921A_A4E96D0B2738">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_921A_A4E96D0B2738" x="823" y="486"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_921A_A4E96D0B2738" x="688" y="468"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_921A_A4E96D0B2738" x="841" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_921A_A4E96D0B2738" x="688" y="469"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5E50B73B_B272_4c8d_B3BF_0CA7ADD341E4" source="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B272_4c8d_B3BF_0CA7ADD341E4" x="326" y="707"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B272_4c8d_B3BF_0CA7ADD341E4" x="623" y="489"/>
+				<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"/>
@@ -10377,263 +11041,258 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D" isFrame="false" modelElement="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_BDCF_E7310A70B190" modelElement="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_BDCF_E7310A70B190" text="epo:ProcessPlanningTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BDCF_E7310A70B190" x="1138" y="455" width="282" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BDCF_E7310A70B190" x="1142" y="294" width="282" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_A53A_502157F5F45A" modelElement="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_A53A_502157F5F45A" text="epo:PlannedProcurementPart"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_A53A_502157F5F45A" x="329" y="262" width="110" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_A53A_502157F5F45A" x="333" y="101" width="110" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_B10A_658AA61F3CAD" modelElement="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_B10A_658AA61F3CAD" text="epo:DirectAwardTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B10A_658AA61F3CAD" x="201" y="666" width="191" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B10A_658AA61F3CAD" x="205" y="505" width="191" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_A7AF_B408BAFEB940" x="1058" y="687" width="123" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_A7AF_B408BAFEB940" x="1062" y="526" width="123" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_AAF2_9B8BD55CD496" modelElement="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_AAF2_9B8BD55CD496" text="epo:Prize"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AAF2_9B8BD55CD496" x="342" y="869" width="178" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AAF2_9B8BD55CD496" x="348" y="696" width="178" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B53F_E7A5B530FFFD" x="235" y="453" width="123" height="71"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B53F_E7A5B530FFFD" x="239" y="292" width="123" height="71"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_B1DF_AD05AE937E9D" modelElement="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_B1DF_AD05AE937E9D" text="epo:Term"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B1DF_AD05AE937E9D" x="1065" y="285" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_B1DF_AD05AE937E9D" x="1069" y="124" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AC62_FA4769B4D88C" x="572" y="626" width="250" height="150"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AC62_FA4769B4D88C" x="576" y="465" width="250" height="150"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_9E5F_29ED464CE561" modelElement="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_9E5F_29ED464CE561" text="epo:SubcontractTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_9E5F_29ED464CE561" x="804" y="997" width="315" height="124"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_9E5F_29ED464CE561" x="808" y="836" width="315" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_BA64_B05755E636F2" modelElement="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_BA64_B05755E636F2" text="epo:ContractTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BA64_B05755E636F2" x="1263" y="952" width="314" height="215"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BA64_B05755E636F2" x="1267" y="791" width="314" height="215"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_835A_24C87816F40C" x="628" y="855" width="261" height="98"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_835A_24C87816F40C" x="632" y="669" width="261" height="98"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BAA8_68D1BF528FF5" x="582" y="228" width="232" height="137"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BAA8_68D1BF528FF5" x="586" y="67" width="232" height="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_80B0_0C345D6703F4" x="554" y="414" width="287" height="150"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_80B0_0C345D6703F4" x="558" y="253" width="287" height="150"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_BAF3_ED8B1330B5E6" modelElement="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_BAF3_ED8B1330B5E6" text="epo:ContractSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BAF3_ED8B1330B5E6" x="1309" y="706" width="151" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BAF3_ED8B1330B5E6" x="1313" y="545" width="151" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_AB77_BA5692ADE213" modelElement="EAID_9776729F_9284_46c1_AB77_BA5692ADE213">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_AB77_BA5692ADE213" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AB77_BA5692ADE213" x="484" y="481" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AB77_BA5692ADE213" x="511" y="320" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_84D3_1D36186827ED" modelElement="EAID_1B056616_B822_4add_84D3_1D36186827ED">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_84D3_1D36186827ED" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_84D3_1D36186827ED" x="972" y="312" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_84D3_1D36186827ED" x="976" y="151" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_82BA_5525819A470C" modelElement="EAID_75629D1B_E406_4b38_82BA_5525819A470C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_82BA_5525819A470C" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_82BA_5525819A470C" x="933" y="724" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_82BA_5525819A470C" x="937" y="563" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_AEE4_319B6DD14F24" modelElement="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_AEE4_319B6DD14F24" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AEE4_319B6DD14F24" x="972" y="312" width="14" height="14"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_BC1E_CEFA76106847" modelElement="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_BC1E_CEFA76106847" x="848" y="28" width="115" height="127"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_AEE4_319B6DD14F24" x="976" y="151" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_E7B9DC27_DFB5_40f5_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DFB5_40f5_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_8372_75A07B6AB066" x="1172" y="564" width="216" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DFB5_40f5_8372_75A07B6AB066" x="1175" y="395" width="216" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_BE3B_872E1A0882C0" x="1418" y="952"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_BE3B_872E1A0882C0" x="1418" y="776"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_BE3B_872E1A0882C0" x="1422" y="791"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_BE3B_872E1A0882C0" x="1422" y="615"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8F89_5D58DD92BF3C" x="299" y="666"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8F89_5D58DD92BF3C" x="299" y="524"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8F89_5D58DD92BF3C" x="303" y="505"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8F89_5D58DD92BF3C" x="303" y="363"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_B67E_B79F177247C7" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DFB5_40f5_B67E_B79F177247C7" text="+epo:refersToPreviousProcedure" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B67E_B79F177247C7" x="421" y="523" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B67E_B79F177247C7" x="425" y="362" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_B67E_B79F177247C7" text="0..1" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B67E_B79F177247C7" x="535" y="546" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B67E_B79F177247C7" x="539" y="385" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B67E_B79F177247C7" x="367" y="666"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B67E_B79F177247C7" x="367" y="541"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_B67E_B79F177247C7" x="554" y="541"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B67E_B79F177247C7" x="371" y="505"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B67E_B79F177247C7" x="371" y="380"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_B67E_B79F177247C7" x="558" y="380"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_B380_6FDE59360DAF" text="+epo:refersToPreviousProcedureLot" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B380_6FDE59360DAF" x="413" y="686" width="143" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B380_6FDE59360DAF" x="417" y="525" width="143" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_B380_6FDE59360DAF" text="0..*" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B380_6FDE59360DAF" x="550" y="721" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B380_6FDE59360DAF" x="554" y="560" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B380_6FDE59360DAF" x="392" y="708"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B380_6FDE59360DAF" x="572" y="708"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B380_6FDE59360DAF" x="396" y="547"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B380_6FDE59360DAF" x="576" y="547"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_ADCE_908A980E0342" x="822" y="639"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_ADCE_908A980E0342" x="916" y="639"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_ADCE_908A980E0342" x="916" y="349"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_ADCE_908A980E0342" x="814" y="349"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_ADCE_908A980E0342" x="826" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_ADCE_908A980E0342" x="920" y="478"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_ADCE_908A980E0342" x="920" y="188"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_ADCE_908A980E0342" x="818" y="188"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_80BE_9C778A0BA2A5" x="903" y="711" width="132" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_80BE_9C778A0BA2A5" x="907" y="550" width="132" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_80BE_9C778A0BA2A5" x="1039" y="736" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_80BE_9C778A0BA2A5" x="1043" y="575" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_80BE_9C778A0BA2A5" x="822" y="731"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_80BE_9C778A0BA2A5" x="1058" y="731"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_80BE_9C778A0BA2A5" x="826" y="570"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_80BE_9C778A0BA2A5" x="1062" y="570"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_9F54_76A56333BE1E" text="+epo:definesPrize" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9F54_76A56333BE1E" x="541" y="882" width="72" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9F54_76A56333BE1E" x="547" y="704" width="72" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_9F54_76A56333BE1E" text="0..*" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9F54_76A56333BE1E" x="523" y="909" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9F54_76A56333BE1E" x="529" y="731" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9F54_76A56333BE1E" x="628" y="904"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9F54_76A56333BE1E" x="520" y="904"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9F54_76A56333BE1E" x="632" y="726"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9F54_76A56333BE1E" x="526" y="726"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_993E_46C9ED67ADFA" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_993E_46C9ED67ADFA" x="632" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_993E_46C9ED67ADFA" x="188" y="675"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_993E_46C9ED67ADFA" x="188" y="329"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_993E_46C9ED67ADFA" x="239" y="329"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_982A_26607071A85E" x="889" y="908"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_982A_26607071A85E" x="1117" y="908"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_982A_26607071A85E" x="1117" y="757"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_982A_26607071A85E" x="893" y="722"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_982A_26607071A85E" x="1121" y="722"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_982A_26607071A85E" x="1121" y="596"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_9472_AFC131D1E7F2" x="1006" y="997"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9472_AFC131D1E7F2" x="1006" y="935"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9472_AFC131D1E7F2" x="1371" y="935"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_9472_AFC131D1E7F2" x="1371" y="776"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DFB5_40f5_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9649_6F7949D3D9BA" x="445" y="278" width="135" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9649_6F7949D3D9BA" x="563" y="301" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9649_6F7949D3D9BA" x="439" y="296"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9649_6F7949D3D9BA" x="582" y="296"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9472_AFC131D1E7F2" x="1010" y="836"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9472_AFC131D1E7F2" x="1010" y="774"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9472_AFC131D1E7F2" x="1375" y="774"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_9472_AFC131D1E7F2" x="1375" y="615"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_8694_914903478877" text="+epo:definesSubcontractingTerm" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8694_914903478877" x="1133" y="1018" width="133" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8694_914903478877" x="1137" y="857" width="133" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_8694_914903478877" text="0..1" modelElement="EAID_dst93B546_502A_413a_8694_914903478877">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8694_914903478877" x="1122" y="1046" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8694_914903478877" x="1126" y="885" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8694_914903478877" x="1263" y="1041"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8694_914903478877" x="1119" y="1041"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8694_914903478877" x="1267" y="880"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8694_914903478877" x="1123" y="880"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_B263_41FB53AE1719" source="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B263_41FB53AE1719" x="1317" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B263_41FB53AE1719" x="1317" y="181"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_B263_41FB53AE1719" x="1159" y="181"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_A39E_E74480CCE1D0" text="+epo:foreseesContractSpecificTerm" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_A39E_E74480CCE1D0" x="1522" y="678" width="142" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_A39E_E74480CCE1D0" x="1526" y="517" width="142" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_A39E_E74480CCE1D0" text="0..*" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_A39E_E74480CCE1D0" x="1463" y="748" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_A39E_E74480CCE1D0" x="1467" y="587" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_A39E_E74480CCE1D0" x="814" y="245"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_A39E_E74480CCE1D0" x="1595" y="245"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_A39E_E74480CCE1D0" x="1595" y="743"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_A39E_E74480CCE1D0" x="1460" y="743"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_A39E_E74480CCE1D0" x="818" y="84"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_A39E_E74480CCE1D0" x="1599" y="84"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_A39E_E74480CCE1D0" x="1599" y="582"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_A39E_E74480CCE1D0" x="1464" y="582"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8F66_FA023FA190E7" x="825" y="654" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8F66_FA023FA190E7" x="829" y="493" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_8F66_FA023FA190E7" text="1..*" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8F66_FA023FA190E7" x="825" y="677" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8F66_FA023FA190E7" x="829" y="516" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8F66_FA023FA190E7" x="1225" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8F66_FA023FA190E7" x="1225" y="672"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_8F66_FA023FA190E7" x="822" y="672"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8F66_FA023FA190E7" x="1228" y="465"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8F66_FA023FA190E7" x="1228" y="511"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_8F66_FA023FA190E7" x="826" y="511"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_8AE5_E5806C9B2562" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DFB5_40f5_8AE5_E5806C9B2562" text="+epo:isSubjectToContractSpecificTerm" modelElement="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8AE5_E5806C9B2562" x="1251" y="665" width="153" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_8AE5_E5806C9B2562" x="1256" y="504" width="153" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_8AE5_E5806C9B2562" text="0..*" modelElement="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8AE5_E5806C9B2562" x="1366" y="688" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_8AE5_E5806C9B2562" x="1371" y="527" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8AE5_E5806C9B2562" x="1358" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8AE5_E5806C9B2562" x="1358" y="706"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_AB31_246F04F34435" source="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A521BACC_3593_49bc_AB31_246F04F34435">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_AB31_246F04F34435" x="962" y="155"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_AB31_246F04F34435" x="1078" y="285"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_BF9D_2D348A5961B1" source="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_D957499E_9DCB_46c9_BF9D_2D348A5961B1">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_BF9D_2D348A5961B1" x="848" y="147"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_BF9D_2D348A5961B1" x="766" y="228"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_8AE5_E5806C9B2562" x="1363" y="465"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_8AE5_E5806C9B2562" x="1363" y="545"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_BB96_01E8B1F3E49F" source="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_BB96_01E8B1F3E49F" x="1114" y="687"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_BB96_01E8B1F3E49F" x="1114" y="355"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_BB96_01E8B1F3E49F" x="1118" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_BB96_01E8B1F3E49F" x="1118" y="194"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_9A94_0EFFDFC4B060" source="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9A94_0EFFDFC4B060" x="300" y="453"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9A94_0EFFDFC4B060" x="300" y="198"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9A94_0EFFDFC4B060" x="1109" y="198"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_9A94_0EFFDFC4B060" x="1109" y="285"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9A94_0EFFDFC4B060" x="304" y="292"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9A94_0EFFDFC4B060" x="304" y="49"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9A94_0EFFDFC4B060" x="1113" y="49"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DFB5_40f5_9A94_0EFFDFC4B060" x="1113" y="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_A8A7_C0037581B6D3" x="697" y="414"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_A8A7_C0037581B6D3" x="697" y="365"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_A8A7_C0037581B6D3" x="701" y="253"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_A8A7_C0037581B6D3" x="701" y="204"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9939_FA613CEB5D22" x="361" y="470" width="160" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9939_FA613CEB5D22" x="365" y="309" width="160" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9939_FA613CEB5D22" x="361" y="493" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9939_FA613CEB5D22" x="365" y="332" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9939_FA613CEB5D22" x="554" y="488"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9939_FA613CEB5D22" x="358" y="488"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9939_FA613CEB5D22" x="558" y="327"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9939_FA613CEB5D22" x="362" y="327"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_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_DFB5_40f5_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9195_C96F98BD3349" x="602" y="591" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9195_C96F98BD3349" x="606" y="430" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9195_C96F98BD3349" x="705" y="608" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9195_C96F98BD3349" x="709" y="447" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9195_C96F98BD3349" x="697" y="564"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9195_C96F98BD3349" x="697" y="626"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9195_C96F98BD3349" x="701" y="403"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9195_C96F98BD3349" x="701" y="465"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_9E70_090B7DE95623" source="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9E70_090B7DE95623" x="1429" y="706"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9E70_090B7DE95623" x="1429" y="309"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9E70_090B7DE95623" x="1155" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9E70_090B7DE95623" x="1433" y="545"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9E70_090B7DE95623" x="1433" y="148"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_9E70_090B7DE95623" x="1159" y="148"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_B5DE_D7ED82169378" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DFB5_40f5_B5DE_D7ED82169378" text="+epo:isSubjectToTerm" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B5DE_D7ED82169378" x="973" y="301" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_B5DE_D7ED82169378" x="977" y="140" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_B5DE_D7ED82169378" text="0..*" modelElement="EAID_dst8697AF_821C_40da_B5DE_D7ED82169378">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B5DE_D7ED82169378" x="1046" y="324" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_B5DE_D7ED82169378" x="1050" y="163" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B5DE_D7ED82169378" x="814" y="319"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B5DE_D7ED82169378" x="1065" y="319"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B5DE_D7ED82169378" x="818" y="158"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B5DE_D7ED82169378" x="1069" y="158"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_B263_41FB53AE1719" source="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_B263_41FB53AE1719" x="1313" y="455"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_B263_41FB53AE1719" x="1313" y="342"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DFB5_40f5_B263_41FB53AE1719" x="1155" y="342"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E7B9DC27_DFB5_40f5_9649_6F7949D3D9BA" source="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" target="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" modelElement="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DFB5_40f5_9649_6F7949D3D9BA" text="+epo:foreseesProcurementObject" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DFB5_40f5_9649_6F7949D3D9BA" x="449" y="117" width="135" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DFB5_40f5_9649_6F7949D3D9BA" text="0..1" modelElement="EAID_dstFFCDAE_C459_4420_9649_6F7949D3D9BA">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DFB5_40f5_9649_6F7949D3D9BA" x="567" y="140" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DFB5_40f5_9649_6F7949D3D9BA" x="443" y="135"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DFB5_40f5_9649_6F7949D3D9BA" x="586" y="135"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_D15C967A_82A2_41fa_B64B_40399AE94FF0" isFrame="false" modelElement="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B">
@@ -10643,7 +11302,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_B53F_E7A5B530FFFD" x="553" y="163" width="102" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_B53F_E7A5B530FFFD" x="552" y="163" width="102" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_80B0_0C345D6703F4" text="epo:Procedure"/>
@@ -10651,7 +11310,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_A084_E51BAA1CF00D" modelElement="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_A084_E51BAA1CF00D" text="epo:ProcedureTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_A084_E51BAA1CF00D" x="976" y="108" width="287" height="179"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_A084_E51BAA1CF00D" x="977" y="119" width="287" height="157"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_96AB_8417E2069155" modelElement="EAID_FA070646_D88B_493f_96AB_8417E2069155">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_96AB_8417E2069155" text="epo:FrameworkAgreementTerm"/>
@@ -10659,23 +11318,47 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_8DE2_A3943CDEC6CA" modelElement="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_8DE2_A3943CDEC6CA" text="epo:SubmissionTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_8DE2_A3943CDEC6CA" x="955" y="367" width="330" height="215"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_8DE2_A3943CDEC6CA" x="955" y="322" width="330" height="215"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_9EC7_90D2BE971F58" modelElement="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_9EC7_90D2BE971F58" text="epo:AccessTerm"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_9EC7_90D2BE971F58" x="332" y="426" width="323" height="98"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_835A_24C87816F40C" x="82" y="2" width="261" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_8108_0018817C75BD" modelElement="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_8108_0018817C75BD" text="epo:OpeningTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_8108_0018817C75BD" x="492" y="23" width="223" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D15C967A_82A2_41fa_95D1_9F9A3F8B34D8" modelElement="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_82A2_41fa_95D1_9F9A3F8B34D8" text="epo:ReviewTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_82A2_41fa_95D1_9F9A3F8B34D8" x="821" y="15" width="256" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_8310_BCB1832C647A" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_8310_BCB1832C647A" x="843" y="100"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_8310_BCB1832C647A" x="654" y="177"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_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_82A2_41fa_BF56_83000481AB12" x="603" y="108"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_BF56_83000481AB12" x="603" y="163"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_993E_46C9ED67ADFA" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_993E_46C9ED67ADFA" x="343" y="104"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_993E_46C9ED67ADFA" x="552" y="179"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_B4F1_E98AB4374F1C" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_B4F1_E98AB4374F1C" x="511" y="426"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_B4F1_E98AB4374F1C" x="589" y="233"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_B4F1_E98AB4374F1C" x="588" y="233"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_92ED_5A488B7D6FC6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_92ED_5A488B7D6FC6" x="955" y="384"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_92ED_5A488B7D6FC6" x="655" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_92ED_5A488B7D6FC6" x="955" y="342"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_92ED_5A488B7D6FC6" x="654" y="218"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_897A_253ACD64FC8A" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_897A_253ACD64FC8A" x="805" y="413"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_897A_253ACD64FC8A" x="612" y="233"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_897A_253ACD64FC8A" x="611" y="233"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_B67E_B79F177247C7" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_82A2_41fa_B67E_B79F177247C7" text="+epo:refersToPreviousProcedure" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
@@ -10689,21 +11372,21 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_8F89_5D58DD92BF3C" x="260" y="440"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_8F89_5D58DD92BF3C" x="555" y="233"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_8F89_5D58DD92BF3C" x="554" y="233"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_9E13_5EC63FC08031" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_9E13_5EC63FC08031" x="976" y="197"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_9E13_5EC63FC08031" x="655" y="197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_9E13_5EC63FC08031" x="977" y="197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_9E13_5EC63FC08031" x="654" y="197"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D15C967A_82A2_41fa_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_82A2_41fa_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_82A2_41fa_9939_FA613CEB5D22" x="410" y="161" width="137" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_82A2_41fa_9939_FA613CEB5D22" x="370" y="176" width="160" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_82A2_41fa_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_82A2_41fa_9939_FA613CEB5D22" x="534" y="202" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_82A2_41fa_9939_FA613CEB5D22" x="533" y="202" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_82A2_41fa_9939_FA613CEB5D22" x="352" y="197"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_9939_FA613CEB5D22" x="553" y="197"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_82A2_41fa_9939_FA613CEB5D22" x="552" y="197"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_EED57D8A_C481_4411_A6B7_122C23812ACA" isFrame="false" modelElement="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B">
@@ -10713,7 +11396,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_A7AF_B408BAFEB940" x="1002" y="321" width="183" height="56"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_A7AF_B408BAFEB940" x="1002" y="314" width="183" height="56"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_A94E_A9202738B188" modelElement="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_A94E_A9202738B188" text="epo:EvaluationTerm"/>
@@ -10745,7 +11428,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_835A_24C87816F40C" modelElement="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_835A_24C87816F40C" text="epo:DesignContestRegimeTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_835A_24C87816F40C" x="266" y="664" width="261" height="88"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_835A_24C87816F40C" x="266" y="664" width="261" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_9EC7_90D2BE971F58" modelElement="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_9EC7_90D2BE971F58" text="epo:AccessTerm"/>
@@ -10761,7 +11444,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_B8D5_38C02E2C8998" modelElement="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_B8D5_38C02E2C8998" text="epo:SecurityClearanceTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_B8D5_38C02E2C8998" x="206" y="554" width="234" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_B8D5_38C02E2C8998" x="167" y="479" width="234" height="75"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_BAF3_ED8B1330B5E6" modelElement="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_BAF3_ED8B1330B5E6" text="epo:ContractSpecificTerm"/>
@@ -10773,7 +11456,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_BDCF_E7310A70B190" modelElement="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_BDCF_E7310A70B190" text="epo:ProcessPlanningTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_BDCF_E7310A70B190" x="439" y="308" width="282" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_BDCF_E7310A70B190" x="440" y="273" width="282" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_A10D_2BA34123A366" modelElement="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_A10D_2BA34123A366" text="epo:ParticipationRequestTerm"/>
@@ -10781,7 +11464,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_8141_092908A95E2B" modelElement="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_8141_092908A95E2B" text="epo:NonDisclosureAgreementTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_8141_092908A95E2B" x="26" y="452" width="264" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_8141_092908A95E2B" x="36" y="383" width="264" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_8846_DAF686401728" modelElement="EAID_C7B390E7_9D78_49dc_8846_DAF686401728">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_8846_DAF686401728" text="epo:SelectionEvaluationTerm"/>
@@ -10791,17 +11474,24 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_92A7_459C07235810" text="epo:AwardEvaluationTerm"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_92A7_459C07235810" x="425" y="1076" width="295" height="101"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_982A_26607071A85E" x="481" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_982A_26607071A85E" x="1038" y="377"/>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_EED57D8A_C481_4411_A170_F1414A602530" modelElement="EAID_D67F46E0_2B15_4614_A170_F1414A602530">
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_A170_F1414A602530" x="1427" y="47" width="115" height="110"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_EED57D8A_C481_4411_95D1_9F9A3F8B34D8" modelElement="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_C481_4411_95D1_9F9A3F8B34D8" text="epo:ReviewTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_C481_4411_95D1_9F9A3F8B34D8" x="184" y="574" width="256" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_BE3B_872E1A0882C0" x="1799" y="290"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_BE3B_872E1A0882C0" x="1647" y="272"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_84EA_F015F6FE1271" source="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_84EA_F015F6FE1271" x="290" y="467"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_84EA_F015F6FE1271" x="1002" y="362"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_84EA_F015F6FE1271" x="300" y="407"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_84EA_F015F6FE1271" x="1002" y="349"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_B263_41FB53AE1719" source="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B263_41FB53AE1719" x="680" y="308"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B263_41FB53AE1719" x="1170" y="138"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B263_41FB53AE1719" x="700" y="273"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B263_41FB53AE1719" x="1170" y="135"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_BAE1_E10B6A40FB7A" source="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" target="EAID_0C735489_15DC_40a7_A94E_A9202738B188" modelElement="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_BAE1_E10B6A40FB7A" x="761" y="1002"/>
@@ -10811,13 +11501,25 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_84D6_B7AEDF8DCACA" x="605" y="1076"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_84D6_B7AEDF8DCACA" x="764" y="838"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_97F8_19A9D21CBAEB" source="EAID_D67F46E0_2B15_4614_A170_F1414A602530" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_97F8_19A9D21CBAEB" x="1458" y="157"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_97F8_19A9D21CBAEB" x="1376" y="335"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_921A_A4E96D0B2738" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_B3295353_448F_433c_921A_A4E96D0B2738">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_921A_A4E96D0B2738" x="414" y="574"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_921A_A4E96D0B2738" x="1011" y="370"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_8310_BCB1832C647A" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_8310_BCB1832C647A" x="440" y="579"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_8310_BCB1832C647A" x="1292" y="379"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_8F89_5D58DD92BF3C" x="1824" y="615"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_8F89_5D58DD92BF3C" x="1425" y="391"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_8335_7F9768E9C57B" x="782" y="796"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_8335_7F9768E9C57B" x="1074" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_8335_7F9768E9C57B" x="1074" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_9472_AFC131D1E7F2" x="1798" y="465"/>
@@ -10829,43 +11531,47 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_A104_F62859765981" x="1065" y="871"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A104_F62859765981" x="1087" y="377"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_A5CD_27AE1D84CDDE" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_A5CD_27AE1D84CDDE" x="594" y="910"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A5CD_27AE1D84CDDE" x="1058" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A104_F62859765981" x="1087" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_B3BF_0CA7ADD341E4" source="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B3BF_0CA7ADD341E4" x="959" y="778"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B3BF_0CA7ADD341E4" x="1084" y="377"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_BE3B_872E1A0882C0" x="1799" y="290"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_BE3B_872E1A0882C0" x="1647" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B3BF_0CA7ADD341E4" x="1084" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_9E70_090B7DE95623" source="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_9E70_090B7DE95623" x="1509" y="241"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_9E70_090B7DE95623" x="1286" y="143"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_993E_46C9ED67ADFA" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_993E_46C9ED67ADFA" x="527" y="672"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_993E_46C9ED67ADFA" x="1303" y="391"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_982A_26607071A85E" x="489" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_982A_26607071A85E" x="1040" y="370"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_A55B_588C65D0E49D" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_A55B_588C65D0E49D" x="1617" y="876"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A55B_588C65D0E49D" x="1120" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A55B_588C65D0E49D" x="1120" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_B4F1_E98AB4374F1C" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B4F1_E98AB4374F1C" x="1637" y="876"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B4F1_E98AB4374F1C" x="1378" y="391"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_A633_615CD23835C1" x="502" y="801"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A633_615CD23835C1" x="1056" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_A633_615CD23835C1" x="501" y="801"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A633_615CD23835C1" x="1056" y="370"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_BF56_83000481AB12" x="540" y="801"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_BF56_83000481AB12" x="1325" y="391"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_9E13_5EC63FC08031" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_9E13_5EC63FC08031" x="1740" y="692"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_9E13_5EC63FC08031" x="1396" y="391"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_B910_6C37C39CAAFC" source="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B910_6C37C39CAAFC" x="440" y="554"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B910_6C37C39CAAFC" x="1002" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_B910_6C37C39CAAFC" x="401" y="490"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_B910_6C37C39CAAFC" x="1002" y="361"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_8A8A_E03C23ED1BE1" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_8A8A_E03C23ED1BE1" x="1364" y="883"/>
@@ -10873,74 +11579,86 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_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_C481_4411_98F9_263E29761C37" x="1333" y="883"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_98F9_263E29761C37" x="1103" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_98F9_263E29761C37" x="1103" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_897A_253ACD64FC8A" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_897A_253ACD64FC8A" x="1352" y="883"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_897A_253ACD64FC8A" x="1363" y="391"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_BB96_01E8B1F3E49F" source="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_BB96_01E8B1F3E49F" x="1161" y="321"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_BB96_01E8B1F3E49F" x="1161" y="314"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_BB96_01E8B1F3E49F" x="1220" y="144"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_9A94_0EFFDFC4B060" source="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_9A94_0EFFDFC4B060" x="1343" y="335"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_9A94_0EFFDFC4B060" x="1237" y="144"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_EED57D8A_C481_4411_A5CD_27AE1D84CDDE" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_C481_4411_A5CD_27AE1D84CDDE" x="594" y="910"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_C481_4411_A5CD_27AE1D84CDDE" x="1058" y="370"/>
+			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_93DECF1F_F76C_4644_8A56_143EE13FBA49" isFrame="false" modelElement="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_93DECF1F_F76C_4644_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F76C_4644_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_A7AF_B408BAFEB940" x="10" y="95" width="133" height="37"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_A7AF_B408BAFEB940" x="24" y="185" width="133" height="37"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_93DECF1F_F76C_4644_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F76C_4644_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_B53F_E7A5B530FFFD" x="154" y="95" width="133" height="37"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_B53F_E7A5B530FFFD" x="168" y="185" width="133" height="37"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_93DECF1F_F76C_4644_B1DF_AD05AE937E9D" modelElement="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F76C_4644_B1DF_AD05AE937E9D" text="epo:Term"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_B1DF_AD05AE937E9D" x="181" y="18" width="80" height="34"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_B1DF_AD05AE937E9D" x="292" y="103" width="80" height="34"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_93DECF1F_F76C_4644_A170_F1414A602530" modelElement="EAID_D67F46E0_2B15_4614_A170_F1414A602530">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_A170_F1414A602530" x="133" y="182" width="177" height="92"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_A170_F1414A602530" x="147" y="272" width="177" height="92"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_93DECF1F_F76C_4644_BAF3_ED8B1330B5E6" modelElement="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F76C_4644_BAF3_ED8B1330B5E6" text="epo:ContractSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_BAF3_ED8B1330B5E6" x="299" y="96" width="133" height="37"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_BAF3_ED8B1330B5E6" x="313" y="186" width="133" height="37"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_93DECF1F_F76C_4644_BDCF_E7310A70B190" modelElement="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F76C_4644_BDCF_E7310A70B190" text="epo:ProcessPlanningTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F76C_4644_BDCF_E7310A70B190" x="469" y="186" width="282" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_93DECF1F_F76C_4644_B263_41FB53AE1719" source="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_B263_41FB53AE1719" x="513" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_B263_41FB53AE1719" x="372" y="134"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_93DECF1F_F76C_4644_97F8_19A9D21CBAEB" source="EAID_D67F46E0_2B15_4614_A170_F1414A602530" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_97F8_19A9D21CBAEB" x="220" y="182"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_97F8_19A9D21CBAEB" x="220" y="132"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_97F8_19A9D21CBAEB" x="234" y="272"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_97F8_19A9D21CBAEB" x="234" y="222"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_93DECF1F_F76C_4644_9E70_090B7DE95623" source="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_9E70_090B7DE95623" x="332" y="96"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_9E70_090B7DE95623" x="251" y="52"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_9E70_090B7DE95623" x="368" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_9E70_090B7DE95623" x="341" y="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_93DECF1F_F76C_4644_9A94_0EFFDFC4B060" source="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_9A94_0EFFDFC4B060" x="223" y="95"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_9A94_0EFFDFC4B060" x="223" y="52"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_9A94_0EFFDFC4B060" x="260" y="185"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_9A94_0EFFDFC4B060" x="317" y="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_93DECF1F_F76C_4644_BB96_01E8B1F3E49F" source="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" target="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" modelElement="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_BB96_01E8B1F3E49F" x="109" y="95"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_BB96_01E8B1F3E49F" x="189" y="52"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F76C_4644_BB96_01E8B1F3E49F" x="142" y="185"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F76C_4644_BB96_01E8B1F3E49F" x="292" y="133"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_50C91B53_24EC_4381_8FBC_58D5E1FF319F" isFrame="false" modelElement="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_50C91B53_24EC_4381_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_24EC_4381_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_A7AF_B408BAFEB940" x="268" y="57" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_A7AF_B408BAFEB940" x="268" y="77" width="90" height="50"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_50C91B53_24EC_4381_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_24EC_4381_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_AC62_FA4769B4D88C" x="557" y="66" width="111" height="52"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_AC62_FA4769B4D88C" x="552" y="76" width="111" height="52"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_50C91B53_24EC_4381_9C2C_09AD5D3F4615" modelElement="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_24EC_4381_9C2C_09AD5D3F4615" text="epo:ParticipationRequestProcessor"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_9C2C_09AD5D3F4615" x="68" y="308" width="163" height="32"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_9C2C_09AD5D3F4615" x="68" y="290" width="163" height="32"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_50C91B53_24EC_4381_9299_6171EF9D6788" modelElement="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_24EC_4381_9299_6171EF9D6788" text="epo:ParticipationRequestReceiver"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_9299_6171EF9D6788" x="394" y="308" width="163" height="32"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_24EC_4381_9299_6171EF9D6788" x="394" y="290" width="163" height="32"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_50C91B53_24EC_4381_A10D_2BA34123A366" modelElement="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_24EC_4381_A10D_2BA34123A366" text="epo:ParticipationRequestTerm"/>
@@ -10948,13 +11666,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_50C91B53_24EC_4381_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_24EC_4381_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_80BE_9C778A0BA2A5" x="377" y="76" width="132" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_80BE_9C778A0BA2A5" x="377" y="86" width="132" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_24EC_4381_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_80BE_9C778A0BA2A5" x="361" y="97" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_80BE_9C778A0BA2A5" x="361" y="107" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_24EC_4381_80BE_9C778A0BA2A5" x="557" y="92"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_24EC_4381_80BE_9C778A0BA2A5" x="358" y="92"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_24EC_4381_80BE_9C778A0BA2A5" x="552" y="102"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_24EC_4381_80BE_9C778A0BA2A5" x="358" y="102"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_50C91B53_24EC_4381_B3BF_0CA7ADD341E4" source="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_24EC_4381_B3BF_0CA7ADD341E4" x="312" y="183"/>
@@ -10962,82 +11680,117 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_50C91B53_24EC_4381_AABC_E6BE700C4FCC" source="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" target="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" modelElement="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_24EC_4381_AABC_E6BE700C4FCC" text="+epo:definesParticipationRequestProcessor" modelElement="EAID_dstFE789F_365A_4f79_AABC_E6BE700C4FCC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_AABC_E6BE700C4FCC" x="59" y="263" width="172" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_AABC_E6BE700C4FCC" x="61" y="252" width="172" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_24EC_4381_AABC_E6BE700C4FCC" text="0..1" modelElement="EAID_dstFE789F_365A_4f79_AABC_E6BE700C4FCC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_AABC_E6BE700C4FCC" x="128" y="290" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_AABC_E6BE700C4FCC" x="128" y="272" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_24EC_4381_AABC_E6BE700C4FCC" x="231" y="199"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_24EC_4381_AABC_E6BE700C4FCC" x="146" y="199"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_24EC_4381_AABC_E6BE700C4FCC" x="146" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_24EC_4381_AABC_E6BE700C4FCC" x="146" y="290"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_50C91B53_24EC_4381_B2EF_82E934FAC2F4" source="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" target="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" modelElement="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_24EC_4381_B2EF_82E934FAC2F4" text="+epo:definesParticipationRequestReceiver" modelElement="EAID_dst5D53F4_253B_4698_B2EF_82E934FAC2F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_B2EF_82E934FAC2F4" x="386" y="270" width="168" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_24EC_4381_B2EF_82E934FAC2F4" x="386" y="252" width="168" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_24EC_4381_B2EF_82E934FAC2F4" text="0..1" modelElement="EAID_dst5D53F4_253B_4698_B2EF_82E934FAC2F4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_B2EF_82E934FAC2F4" x="477" y="291" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_24EC_4381_B2EF_82E934FAC2F4" x="477" y="273" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_24EC_4381_B2EF_82E934FAC2F4" x="394" y="200"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_24EC_4381_B2EF_82E934FAC2F4" x="475" y="200"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_24EC_4381_B2EF_82E934FAC2F4" x="475" y="308"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_24EC_4381_B2EF_82E934FAC2F4" x="475" y="290"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C8DC6361_5EBA_4481_8EFD_D6B0AD8DA1B4" isFrame="false" modelElement="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_9A2D_CD97C5116067" modelElement="EAID_07601514_1C57_47ce_9A2D_CD97C5116067">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_9A2D_CD97C5116067" text="epo:Reviewer"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_9A2D_CD97C5116067" x="419" y="380" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_9A2D_CD97C5116067" x="844" y="351" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_A7AF_B408BAFEB940" text="epo:LotSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_A7AF_B408BAFEB940" x="162" y="120" width="90" height="46"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_A7AF_B408BAFEB940" x="583" y="103" width="90" height="46"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_AC62_FA4769B4D88C" x="419" y="114" width="250" height="59"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_AC62_FA4769B4D88C" x="826" y="97" width="125" height="59"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_A8B8_B385E9A6811B" modelElement="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_A8B8_B385E9A6811B" text="epo:ReviewProcedureInformationProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_A8B8_B385E9A6811B" x="116" y="380" width="183" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_A8B8_B385E9A6811B" x="537" y="351" width="183" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_95D1_9F9A3F8B34D8" modelElement="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_95D1_9F9A3F8B34D8" text="epo:ReviewTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_95D1_9F9A3F8B34D8" x="79" y="226" width="256" height="75"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_95D1_9F9A3F8B34D8" x="500" y="209" width="256" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_B53F_E7A5B530FFFD" x="281" y="103" width="139" height="46"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C8DC6361_5EBA_4481_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_5EBA_4481_80B0_0C345D6703F4" text="epo:Procedure"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5EBA_4481_80B0_0C345D6703F4" x="211" y="209" width="278" height="111"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_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_5EBA_4481_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_9195_C96F98BD3349" x="705" y="57" width="171" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5EBA_4481_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_9195_C96F98BD3349" x="883" y="79" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_9195_C96F98BD3349" x="260" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_9195_C96F98BD3349" x="260" y="72"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5EBA_4481_9195_C96F98BD3349" x="875" y="72"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5EBA_4481_9195_C96F98BD3349" x="875" y="97"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_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_5EBA_4481_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_9939_FA613CEB5D22" x="276" y="174" width="160" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5EBA_4481_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_9939_FA613CEB5D22" x="362" y="154" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_9939_FA613CEB5D22" x="350" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_9939_FA613CEB5D22" x="350" y="149"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_8310_BCB1832C647A" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_8310_BCB1832C647A" x="534" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_8310_BCB1832C647A" x="534" y="127"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5EBA_4481_8310_BCB1832C647A" x="420" y="127"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_8EA1_111804B30C38" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" modelElement="EAID_1B531817_E843_4c42_8EA1_111804B30C38">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5EBA_4481_8EA1_111804B30C38" text="+epo:definesReviewer" modelElement="EAID_dst531817_E843_4c42_8EA1_111804B30C38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_8EA1_111804B30C38" x="413" y="342" width="90" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_8EA1_111804B30C38" x="835" y="313" width="90" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5EBA_4481_8EA1_111804B30C38" text="0..*" modelElement="EAID_dst531817_E843_4c42_8EA1_111804B30C38">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_8EA1_111804B30C38" x="468" y="362" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_8EA1_111804B30C38" x="890" y="333" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_8EA1_111804B30C38" x="335" y="254"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_8EA1_111804B30C38" x="460" y="254"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5EBA_4481_8EA1_111804B30C38" x="460" y="380"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_8EA1_111804B30C38" x="756" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_8EA1_111804B30C38" x="882" y="250"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5EBA_4481_8EA1_111804B30C38" x="882" y="351"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_AC22_DE4C7CCE3C2E" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" modelElement="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5EBA_4481_AC22_DE4C7CCE3C2E" text="+epo:definesReviewProcedureInformationProvider" modelElement="EAID_dst9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="112" y="346" width="202" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="533" y="317" width="202" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5EBA_4481_AC22_DE4C7CCE3C2E" text="0..1" modelElement="EAID_dst9C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="214" y="362" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="635" y="333" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="206" y="301"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_AC22_DE4C7CCE3C2E" x="206" y="380"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_AC22_DE4C7CCE3C2E" x="627" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_AC22_DE4C7CCE3C2E" x="627" y="351"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_921A_A4E96D0B2738" source="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_B3295353_448F_433c_921A_A4E96D0B2738">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_921A_A4E96D0B2738" x="207" y="226"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_921A_A4E96D0B2738" x="207" y="166"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_921A_A4E96D0B2738" x="628" y="209"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_921A_A4E96D0B2738" x="628" y="149"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C8DC6361_5EBA_4481_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_5EBA_4481_80BE_9C778A0BA2A5" text="+epo:isSubjectToLotSpecificTerm" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_80BE_9C778A0BA2A5" x="286" y="118" width="109" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5EBA_4481_80BE_9C778A0BA2A5" x="687" y="110" width="132" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5EBA_4481_80BE_9C778A0BA2A5" text="0..*" modelElement="EAID_dstEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_80BE_9C778A0BA2A5" x="255" y="148" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5EBA_4481_80BE_9C778A0BA2A5" x="676" y="131" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_80BE_9C778A0BA2A5" x="419" y="143"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_80BE_9C778A0BA2A5" x="252" y="143"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5EBA_4481_80BE_9C778A0BA2A5" x="826" y="126"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5EBA_4481_80BE_9C778A0BA2A5" x="673" y="126"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_38144752_9ABC_4c2a_B03E_C2B16451B7D1" isFrame="false" modelElement="EAPK_3A47255F_6E4B_400c_B002_879945E85F53">
@@ -11052,7 +11805,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_A1A0_C190337F6440" modelElement="EAID_1FF5173E_4940_44db_A1A0_C190337F6440">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9ABC_4c2a_A1A0_C190337F6440" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_A1A0_C190337F6440" text="at-voc:communication-justification"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_A1A0_C190337F6440" x="1234" y="316" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_A1A0_C190337F6440" x="1228" y="460" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_BE84_76269B5BBD68" modelElement="EAID_29678A10_6473_461a_BE84_76269B5BBD68">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_BE84_76269B5BBD68" text="locn:Address"/>
@@ -11076,11 +11829,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_8108_0018817C75BD" modelElement="EAID_82AA47D1_6939_4328_8108_0018817C75BD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_8108_0018817C75BD" text="epo:OpeningTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_8108_0018817C75BD" x="421" y="285" width="223" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_8108_0018817C75BD" x="430" y="306" width="223" height="85"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_AEBA_5D8644A7677A" modelElement="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_AEBA_5D8644A7677A" text="epo:OfflineAccessProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_AEBA_5D8644A7677A" x="763" y="744" width="139" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_AEBA_5D8644A7677A" x="763" y="713" width="139" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_B8D5_38C02E2C8998" modelElement="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_B8D5_38C02E2C8998" text="epo:SecurityClearanceTerm"/>
@@ -11092,64 +11845,68 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_90B7_4F724B6E5E5E" modelElement="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_90B7_4F724B6E5E5E" text="epo:ProcurementProcedureInformationProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_90B7_4F724B6E5E5E" x="516" y="744" width="231" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_90B7_4F724B6E5E5E" x="516" y="713" width="231" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_B53F_E7A5B530FFFD" x="1099" y="390" width="102" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_B53F_E7A5B530FFFD" x="1099" y="353" width="102" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_80B0_0C345D6703F4" text="epo:Procedure"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_80B0_0C345D6703F4" x="1351" y="366" width="294" height="117"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_80B0_0C345D6703F4" x="1352" y="353" width="294" height="117"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_38144752_9ABC_4c2a_8141_092908A95E2B" modelElement="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9ABC_4c2a_8141_092908A95E2B" text="epo:NonDisclosureAgreementTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_8141_092908A95E2B" x="884" y="269" width="264" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9ABC_4c2a_8141_092908A95E2B" x="902" y="275" width="264" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_B219_FFD9D57F9B43" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" modelElement="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9ABC_4c2a_B219_FFD9D57F9B43" text="+epo:involvesProcurementDocument" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_B219_FFD9D57F9B43" x="1065" y="555" width="149" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_B219_FFD9D57F9B43" text="1" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_B219_FFD9D57F9B43" x="1207" y="578" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_B219_FFD9D57F9B43" text="0..1" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_B219_FFD9D57F9B43" x="1196" y="578" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B219_FFD9D57F9B43" x="1055" y="573"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_B219_FFD9D57F9B43" x="1215" y="573"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_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_9ABC_4c2a_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_9939_FA613CEB5D22" x="1213" y="394" width="137" height="27"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_9939_FA613CEB5D22" x="1213" y="360" width="137" height="27"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_9939_FA613CEB5D22" x="1204" y="429" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_9939_FA613CEB5D22" x="1204" y="395" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_9939_FA613CEB5D22" x="1351" y="424"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_9939_FA613CEB5D22" x="1201" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_9939_FA613CEB5D22" x="1352" y="390"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_9939_FA613CEB5D22" x="1201" y="390"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_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_9ABC_4c2a_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_9195_C96F98BD3349" x="1390" y="320" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_9195_C96F98BD3349" x="1401" y="314" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_9195_C96F98BD3349" x="1510" y="287" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_9195_C96F98BD3349" x="1498" y="366"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_9195_C96F98BD3349" x="1498" y="353"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_9195_C96F98BD3349" x="1498" y="282"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_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_9ABC_4c2a_A633_615CD23835C1" x="531" y="285"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_A633_615CD23835C1" x="531" y="236"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_A633_615CD23835C1" x="544" y="306"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_A633_615CD23835C1" x="544" y="236"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_A633_615CD23835C1" x="733" y="236"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_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_9ABC_4c2a_BF56_83000481AB12" x="653" y="370"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_BF56_83000481AB12" x="1099" y="370"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_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_9ABC_4c2a_98A5_58BD6A43131C" text="+epo:definesOpeningPlace" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_98A5_58BD6A43131C" x="483" y="390" width="108" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_98A5_58BD6A43131C" x="491" y="397" width="108" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_98A5_58BD6A43131C" text="0..1" modelElement="EAID_dstCBD7C1_E82A_4979_98A5_58BD6A43131C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_98A5_58BD6A43131C" x="546" y="415" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_98A5_58BD6A43131C" x="554" y="415" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_98A5_58BD6A43131C" x="538" y="370"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_98A5_58BD6A43131C" x="538" y="433"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_98A5_58BD6A43131C" x="546" y="391"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_98A5_58BD6A43131C" x="546" y="433"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_A55B_588C65D0E49D" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_A55B_588C65D0E49D" x="765" y="526"/>
@@ -11176,35 +11933,35 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_989F_32AD38804C63" x="1023" y="686"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_84EA_F015F6FE1271" source="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_84EA_F015F6FE1271" x="956" y="269"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_84EA_F015F6FE1271" x="956" y="235"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_84EA_F015F6FE1271" x="1000" y="275"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_84EA_F015F6FE1271" x="1000" y="235"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_84EA_F015F6FE1271" x="823" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_B180_ECBF0307105F" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" modelElement="EAID_F1286B9A_905F_403f_B180_ECBF0307105F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B180_ECBF0307105F" x="1019" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_B180_ECBF0307105F" x="1019" y="357"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_B180_ECBF0307105F" x="1234" y="357"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B180_ECBF0307105F" x="1047" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_B180_ECBF0307105F" x="1047" y="498"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_B180_ECBF0307105F" x="1228" y="498"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_8DA7_19386DB49579" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" modelElement="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9ABC_4c2a_8DA7_19386DB49579" text="+epo:definesProcurementProcedureInformationProvider" modelElement="EAID_dstDE70B2_FCDD_46b7_8DA7_19386DB49579">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_8DA7_19386DB49579" x="506" y="697" width="224" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_8DA7_19386DB49579" x="506" y="666" width="224" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_8DA7_19386DB49579" text="0..1" modelElement="EAID_dstDE70B2_FCDD_46b7_8DA7_19386DB49579">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_8DA7_19386DB49579" x="628" y="726" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_8DA7_19386DB49579" x="628" y="695" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_8DA7_19386DB49579" x="732" y="600"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_8DA7_19386DB49579" x="620" y="600"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_8DA7_19386DB49579" x="620" y="744"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_8DA7_19386DB49579" x="620" y="713"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_8502_C5AC8F9FFC84" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" modelElement="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9ABC_4c2a_8502_C5AC8F9FFC84" text="+epo:definesOfflineAccessProvider" modelElement="EAID_dstB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="782" y="701" width="140" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="784" y="670" width="140" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9ABC_4c2a_8502_C5AC8F9FFC84" text="0..1" modelElement="EAID_dstB3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="850" y="726" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="852" y="695" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="842" y="634"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_8502_C5AC8F9FFC84" x="842" y="744"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_8502_C5AC8F9FFC84" x="844" y="634"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_8502_C5AC8F9FFC84" x="844" y="713"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_83A7_6E582F53DA90" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" modelElement="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9ABC_4c2a_83A7_6E582F53DA90" text="+epo:refersToPlannedPart" modelElement="EAID_dst25948E_6ABD_4c9b_83A7_6E582F53DA90">
@@ -11218,9 +11975,9 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_83A7_6E582F53DA90" x="1263" y="786"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_B4F1_E98AB4374F1C" source="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B4F1_E98AB4374F1C" x="1031" y="526"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_B4F1_E98AB4374F1C" x="1031" y="424"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_B4F1_E98AB4374F1C" x="1099" y="424"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B4F1_E98AB4374F1C" x="1026" y="526"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9ABC_4c2a_B4F1_E98AB4374F1C" x="1026" y="409"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9ABC_4c2a_B4F1_E98AB4374F1C" x="1099" y="409"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_38144752_9ABC_4c2a_B910_6C37C39CAAFC" source="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9ABC_4c2a_B910_6C37C39CAAFC" x="874" y="403"/>
@@ -11242,11 +11999,11 @@
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_5BF26AED_231A_435a_ABCE_4EEF97F1ED4A" isFrame="false" modelElement="EAPK_094322B0_93A9_4632_B662_C313D87D9F60">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_B10A_658AA61F3CAD" modelElement="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_B10A_658AA61F3CAD" text="epo:DirectAwardTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_B10A_658AA61F3CAD" x="950" y="207" width="191" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_B10A_658AA61F3CAD" x="1003" y="207" width="191" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_BF42_2A6E50CAF4E6" modelElement="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_BF42_2A6E50CAF4E6" text="epo:LotGroup"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_BF42_2A6E50CAF4E6" x="818" y="187" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_BF42_2A6E50CAF4E6" x="818" y="187" width="171" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_B53F_E7A5B530FFFD" modelElement="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_B53F_E7A5B530FFFD" text="epo:ProcedureSpecificTerm"/>
@@ -11254,12 +12011,12 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_AC62_FA4769B4D88C" modelElement="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_AC62_FA4769B4D88C" text="epo:Lot"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_AC62_FA4769B4D88C" x="950" y="32" width="217" height="124"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_AC62_FA4769B4D88C" x="1003" y="32" width="174" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_88D7_A606F48EEBAE" modelElement="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_231A_435a_88D7_A606F48EEBAE" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_88D7_A606F48EEBAE" text="at-voc:direct-award-justification"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_88D7_A606F48EEBAE" x="1277" y="217" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_88D7_A606F48EEBAE" x="1330" y="217" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_B611_0048946DC070" modelElement="EAID_49EC0F16_408C_4b28_B611_0048946DC070">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_B611_0048946DC070" text="epo:ProcurementServiceProvider"/>
@@ -11267,7 +12024,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_94EC_172DCDA4EF78" modelElement="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_94EC_172DCDA4EF78" text="epo:BudgetProvider"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_94EC_172DCDA4EF78" x="762" y="549" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_94EC_172DCDA4EF78" x="762" y="517" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_5BF26AED_231A_435a_80A4_32F092496FEF" modelElement="EAID_70B4792E_F818_45db_80A4_32F092496FEF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_80A4_32F092496FEF" text="ProxyConnector"/>
@@ -11295,7 +12052,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5BF26AED_231A_435a_B7BD_BF404238BDB5" modelElement="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_231A_435a_B7BD_BF404238BDB5" text="epo:AuxiliaryParty"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_B7BD_BF404238BDB5" x="959" y="548" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_231A_435a_B7BD_BF404238BDB5" x="959" y="517" width="90" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_BBA1_4FFA393BE7FA" text="+epo:delegatesAncillaryActivitiesTo" modelElement="EAID_dst76346D_AFB2_421a_BBA1_4FFA393BE7FA">
@@ -11309,40 +12066,40 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_B67E_B79F177247C7" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" modelElement="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_231A_435a_B67E_B79F177247C7" text="+epo:refersToPreviousProcedure" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_B67E_B79F177247C7" x="157" y="45" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_B67E_B79F177247C7" x="152" y="45" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_B67E_B79F177247C7" text="0..1" modelElement="EAID_dst6933BC_AE5B_4536_B67E_B79F177247C7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_B67E_B79F177247C7" x="234" y="77" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_B67E_B79F177247C7" x="229" y="77" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_B67E_B79F177247C7" x="1141" y="228"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_B67E_B79F177247C7" x="1180" y="228"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_B67E_B79F177247C7" x="1180" y="17"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_231A_435a_B67E_B79F177247C7" x="226" y="17"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_231A_435a_B67E_B79F177247C7" x="226" y="95"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_B67E_B79F177247C7" x="1194" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_B67E_B79F177247C7" x="1238" y="212"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_B67E_B79F177247C7" x="1238" y="14"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_231A_435a_B67E_B79F177247C7" x="221" y="14"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_231A_435a_B67E_B79F177247C7" x="221" y="95"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_B380_6FDE59360DAF" text="+epo:refersToPreviousProcedureLot" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_B380_6FDE59360DAF" x="981" y="177" width="143" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_B380_6FDE59360DAF" x="1029" y="177" width="143" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_B380_6FDE59360DAF" text="0..*" modelElement="EAID_dst156914_725C_4a26_B380_6FDE59360DAF">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_B380_6FDE59360DAF" x="1060" y="161" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_B380_6FDE59360DAF" x="1108" y="161" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_B380_6FDE59360DAF" x="1048" y="207"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_B380_6FDE59360DAF" x="1048" y="156"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_B380_6FDE59360DAF" x="1096" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_B380_6FDE59360DAF" x="1096" y="156"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_8B59_3277E5CE2E90" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" modelElement="EAID_279636BF_8F0D_4744_8B59_3277E5CE2E90">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_8B59_3277E5CE2E90" x="1141" y="261"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8B59_3277E5CE2E90" x="1277" y="261"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_8B59_3277E5CE2E90" x="1194" y="261"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8B59_3277E5CE2E90" x="1330" y="261"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_8CF1_D9F81DFCBA1A" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" modelElement="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_231A_435a_8CF1_D9F81DFCBA1A" text="+epo:definesInformationProvider" modelElement="EAID_dst8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_8CF1_D9F81DFCBA1A" x="930" y="508" width="133" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_8CF1_D9F81DFCBA1A" x="930" y="477" width="133" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_8CF1_D9F81DFCBA1A" text="0..*" modelElement="EAID_dst8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_8CF1_D9F81DFCBA1A" x="1011" y="530" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_8CF1_D9F81DFCBA1A" x="1011" y="499" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_8CF1_D9F81DFCBA1A" x="1003" y="467"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8CF1_D9F81DFCBA1A" x="1003" y="548"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8CF1_D9F81DFCBA1A" x="1003" y="517"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_80CD_0C45E80E9AEE" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" modelElement="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_231A_435a_80CD_0C45E80E9AEE" text="+epo:definesMediator" modelElement="EAID_dst05A6CC_6F4E_42f1_80CD_0C45E80E9AEE">
@@ -11360,30 +12117,30 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_9E13_5EC63FC08031" x="629" y="181"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_8F89_5D58DD92BF3C" source="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_8F89_5D58DD92BF3C" x="992" y="207"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8F89_5D58DD92BF3C" x="992" y="164"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_8F89_5D58DD92BF3C" x="1050" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_8F89_5D58DD92BF3C" x="1050" y="164"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_8F89_5D58DD92BF3C" x="629" y="164"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_9ED2_7DCA708FAEF8" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" modelElement="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_231A_435a_9ED2_7DCA708FAEF8" text="+epo:definesBudgetProvider" modelElement="EAID_dst9B2877_CC4F_472f_9ED2_7DCA708FAEF8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9ED2_7DCA708FAEF8" x="754" y="508" width="114" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9ED2_7DCA708FAEF8" x="757" y="476" width="114" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_9ED2_7DCA708FAEF8" text="0..1" modelElement="EAID_dst9B2877_CC4F_472f_9ED2_7DCA708FAEF8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9ED2_7DCA708FAEF8" x="813" y="531" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9ED2_7DCA708FAEF8" x="816" y="499" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_9ED2_7DCA708FAEF8" x="805" y="467"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_9ED2_7DCA708FAEF8" x="805" y="549"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_9ED2_7DCA708FAEF8" x="808" y="467"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_9ED2_7DCA708FAEF8" x="808" y="517"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_BFE6_593632EDB11F" text="+epo:setsGroupingContextForLot" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_BFE6_593632EDB11F" x="817" y="90" width="131" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_BFE6_593632EDB11F" x="870" y="90" width="131" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_BFE6_593632EDB11F" text="1..*" modelElement="EAID_dst732599_332F_4f0e_BFE6_593632EDB11F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_BFE6_593632EDB11F" x="931" y="113" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_BFE6_593632EDB11F" x="984" y="113" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_BFE6_593632EDB11F" x="843" y="187"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_BFE6_593632EDB11F" x="843" y="108"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_BFE6_593632EDB11F" x="950" y="108"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_BFE6_593632EDB11F" x="1003" y="108"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_AB11_165E12CB38A6" text="+epo:actsOnBehalfOf" modelElement="EAID_dst14A192_0DFA_49f4_AB11_165E12CB38A6">
@@ -11438,14 +12195,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9195_C96F98BD3349" x="777" y="46" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9195_C96F98BD3349" x="830" y="46" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9195_C96F98BD3349" x="931" y="69" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9195_C96F98BD3349" x="984" y="69" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_9195_C96F98BD3349" x="275" y="95"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_9195_C96F98BD3349" x="275" y="64"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_9195_C96F98BD3349" x="950" y="64"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_231A_435a_9195_C96F98BD3349" x="1003" y="64"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_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_231A_435a_8CA6_9C68826B377B" x="430" y="296"/>
@@ -11453,13 +12210,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5BF26AED_231A_435a_9069_38D7A3B7A01C" source="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" target="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" modelElement="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_231A_435a_9069_38D7A3B7A01C" text="+epo:definesLotGroup" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9069_38D7A3B7A01C" x="833" y="287" width="89" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_231A_435a_9069_38D7A3B7A01C" x="865" y="287" width="89" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_231A_435a_9069_38D7A3B7A01C" text="0..*" modelElement="EAID_dstCFA3B0_EE66_4ace_9069_38D7A3B7A01C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9069_38D7A3B7A01C" x="883" y="262" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_231A_435a_9069_38D7A3B7A01C" x="915" y="262" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_9069_38D7A3B7A01C" x="871" y="310"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_9069_38D7A3B7A01C" x="871" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_231A_435a_9069_38D7A3B7A01C" x="903" y="310"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_231A_435a_9069_38D7A3B7A01C" x="903" y="257"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_2468B950_9AA0_45fa_9FF2_3F556FA3C967" isFrame="false" modelElement="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E">
@@ -11469,7 +12226,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_847A_7E8C5EEC0432" text="epo:Period"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_847A_7E8C5EEC0432" x="1057" y="394" width="176" height="85"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_847A_7E8C5EEC0432" x="1062" y="422" width="176" height="57"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_8217_0049EA327F90" modelElement="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9AA0_45fa_8217_0049EA327F90" text="enumeration"/>
@@ -11520,6 +12277,71 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_A4B6_FBCE76BF76A2" text="epo:TenderProcessor"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_A4B6_FBCE76BF76A2" x="503" y="603" width="90" height="65"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_A1F4_9F1CD0DD9969" modelElement="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_A1F4_9F1CD0DD9969" text="epo:Duration"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_A1F4_9F1CD0DD9969" x="1106" y="370" width="90" height="28"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_8EA9_58FC31BC055C" modelElement="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_8EA9_58FC31BC055C" text="epo:SpecificDuration"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_8EA9_58FC31BC055C" x="1265" y="350" width="166" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_ACD1_13C3E1A4B7F9" modelElement="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_9AA0_45fa_ACD1_13C3E1A4B7F9" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_ACD1_13C3E1A4B7F9" text="time:TemporalUnit"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_ACD1_13C3E1A4B7F9" x="1303" y="469" width="90" height="60"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_9D0A_235327E62C6E" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" modelElement="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9D0A_235327E62C6E" x="503" y="377"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9D0A_235327E62C6E" x="287" y="377"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_9195_C96F98BD3349" x="879" y="140" width="171" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_9195_C96F98BD3349" x="1075" y="166" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9195_C96F98BD3349" x="160" y="165"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9195_C96F98BD3349" x="160" y="154"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_9195_C96F98BD3349" x="1067" y="154"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_9AA0_45fa_9195_C96F98BD3349" x="1067" y="184"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_8076_1ECB982268EE" x="1348" y="420"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_8076_1ECB982268EE" x="1348" y="469"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_AA82_ECF06C845021" x="1265" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_AA82_ECF06C845021" x="1196" y="384"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_92ED_5A488B7D6FC6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_92ED_5A488B7D6FC6" x="536" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_92ED_5A488B7D6FC6" x="536" y="253"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_8C4E_38DED0468EB4" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_8C4E_38DED0468EB4" x="833" y="504"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_8C4E_38DED0468EB4" x="947" y="504"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_A542_A867A1BED99D" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" modelElement="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A542_A867A1BED99D" x="833" y="366"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A542_A867A1BED99D" x="909" y="366"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_A542_A867A1BED99D" x="909" y="323"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_9939_FA613CEB5D22" x="314" y="198" width="160" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_9939_FA613CEB5D22" x="464" y="224" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9939_FA613CEB5D22" x="307" y="219"/>
+				<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"/>
+			</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">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_80BE_9C778A0BA2A5" x="737" y="206" width="132" height="14"/>
@@ -11530,28 +12352,15 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_80BE_9C778A0BA2A5" x="973" y="220"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_80BE_9C778A0BA2A5" x="713" y="220"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_A104_F62859765981" x="668" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A104_F62859765981" x="668" y="253"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B348_21446E4664A6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" modelElement="EAID_8CA66645_D223_487b_B348_21446E4664A6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B348_21446E4664A6" x="713" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B348_21446E4664A6" x="713" y="309"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_B348_21446E4664A6" x="857" y="309"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B0EA_CB49790C2AAD" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_B0EA_CB49790C2AAD" text="+epo:hasTenderValidityPeriod" modelElement="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_B0EA_CB49790C2AAD" x="934" y="418" width="98" height="27"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_AED5_36E1786ED85F" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" modelElement="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_AED5_36E1786ED85F" text="+epo:definesTenderReceiver" modelElement="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_AED5_36E1786ED85F" x="623" y="566" width="115" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_B0EA_CB49790C2AAD" text="0..1" modelElement="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_B0EA_CB49790C2AAD" x="1038" y="441" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_AED5_36E1786ED85F" text="0..1" modelElement="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_AED5_36E1786ED85F" x="694" y="585" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B0EA_CB49790C2AAD" x="833" y="436"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B0EA_CB49790C2AAD" x="1057" y="436"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B747_66A09DEF42FC" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" modelElement="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B747_66A09DEF42FC" x="503" y="469"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B747_66A09DEF42FC" x="287" y="469"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_AED5_36E1786ED85F" x="686" y="539"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_AED5_36E1786ED85F" x="686" y="603"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_88ED_7EFEB868C4EC" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" modelElement="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_88ED_7EFEB868C4EC" text="+epo:definesTenderProcessor" modelElement="EAID_dst7F270C_1A4E_400c_88ED_7EFEB868C4EC">
@@ -11564,65 +12373,44 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_88ED_7EFEB868C4EC" x="551" y="603"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_88ED_7EFEB868C4EC" x="551" y="603"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_AED5_36E1786ED85F" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" modelElement="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_AED5_36E1786ED85F" text="+epo:definesTenderReceiver" modelElement="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_AED5_36E1786ED85F" x="623" y="566" width="115" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B747_66A09DEF42FC" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" modelElement="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B747_66A09DEF42FC" x="503" y="469"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B747_66A09DEF42FC" x="287" y="469"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B0EA_CB49790C2AAD" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_B0EA_CB49790C2AAD" text="+epo:hasTenderValidityPeriod" modelElement="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_B0EA_CB49790C2AAD" x="922" y="429" width="121" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_AED5_36E1786ED85F" text="0..1" modelElement="EAID_dstC31FFB_F53F_431c_AED5_36E1786ED85F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_AED5_36E1786ED85F" x="694" y="585" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_B0EA_CB49790C2AAD" text="0..1" modelElement="EAID_dst7B06AA_2E5B_4fa1_B0EA_CB49790C2AAD">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_B0EA_CB49790C2AAD" x="1043" y="452" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_AED5_36E1786ED85F" x="686" y="539"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_AED5_36E1786ED85F" x="686" y="603"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B0EA_CB49790C2AAD" x="833" y="447"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B0EA_CB49790C2AAD" x="1062" y="447"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_9D0A_235327E62C6E" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" modelElement="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9D0A_235327E62C6E" x="503" y="377"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9D0A_235327E62C6E" x="287" y="377"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_A355_DA9CD314CBA0" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9AA0_45fa_A355_DA9CD314CBA0" text="+epo:hasTenderValidityDuration" modelElement="EAID_dstA9C84A_C46F_456b_A355_DA9CD314CBA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_A355_DA9CD314CBA0" x="974" y="366" width="130" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_A355_DA9CD314CBA0" text="0..1" modelElement="EAID_dstA9C84A_C46F_456b_A355_DA9CD314CBA0">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_A355_DA9CD314CBA0" x="1087" y="389" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A355_DA9CD314CBA0" x="833" y="384"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A355_DA9CD314CBA0" x="1106" y="384"/>
 			</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"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_B348_21446E4664A6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" modelElement="EAID_8CA66645_D223_487b_B348_21446E4664A6">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_B348_21446E4664A6" x="713" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_B348_21446E4664A6" x="713" y="309"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_B348_21446E4664A6" x="857" y="309"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_A104_F62859765981" x="668" y="334"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A104_F62859765981" x="668" y="253"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_A1CC_20D0D20B3AD0" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" modelElement="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A1CC_20D0D20B3AD0" x="768" y="539"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A1CC_20D0D20B3AD0" x="768" y="639"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_A1CC_20D0D20B3AD0" x="947" y="639"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_A542_A867A1BED99D" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" modelElement="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_A542_A867A1BED99D" x="833" y="366"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_A542_A867A1BED99D" x="909" y="366"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_A542_A867A1BED99D" x="909" y="323"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_8C4E_38DED0468EB4" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" modelElement="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_8C4E_38DED0468EB4" x="833" y="504"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_8C4E_38DED0468EB4" x="947" y="504"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_92ED_5A488B7D6FC6" source="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_92ED_5A488B7D6FC6" x="536" y="334"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_92ED_5A488B7D6FC6" x="536" y="253"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_9195_C96F98BD3349" x="879" y="140" width="171" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_9195_C96F98BD3349" x="1075" y="166" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9195_C96F98BD3349" x="160" y="165"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9195_C96F98BD3349" x="160" y="154"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9AA0_45fa_9195_C96F98BD3349" x="1067" y="154"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_9AA0_45fa_9195_C96F98BD3349" x="1067" y="184"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_2468B950_9AA0_45fa_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_9AA0_45fa_9939_FA613CEB5D22" text="+epo:isSubjectToProcedureSpecificTerm" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9AA0_45fa_9939_FA613CEB5D22" x="314" y="198" width="160" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9AA0_45fa_9939_FA613CEB5D22" text="1..*" modelElement="EAID_dst8C734E_FD33_4153_9939_FA613CEB5D22">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9AA0_45fa_9939_FA613CEB5D22" x="464" y="224" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9AA0_45fa_9939_FA613CEB5D22" x="307" y="219"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9AA0_45fa_9939_FA613CEB5D22" x="483" y="219"/>
-			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_C9FE03EA_71D7_4074_8F14_C707D7228C43" isFrame="false" modelElement="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C9FE03EA_71D7_4074_A7AF_B408BAFEB940" modelElement="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940">
@@ -11660,7 +12448,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C9FE03EA_71D7_4074_BAB3_9047B4874154" modelElement="EAID_3F572668_3AED_4090_BAB3_9047B4874154">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_71D7_4074_BAB3_9047B4874154" text="epo:MultipleStageProcedureTerm"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_71D7_4074_BAB3_9047B4874154" x="713" y="531" width="303" height="124"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_71D7_4074_BAB3_9047B4874154" x="713" y="532" width="303" height="124"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_C9FE03EA_71D7_4074_BA64_B05755E636F2" modelElement="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_71D7_4074_BA64_B05755E636F2" text="epo:ContractTerm"/>
@@ -11750,19 +12538,9 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_71D7_4074_ABBB_CBDD98065B7F" text="at-voc:country"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_71D7_4074_ABBB_CBDD98065B7F" x="2059" y="921" width="90" height="60"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_BEDB_63334B745ECB" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_BEDB_63334B745ECB" text="+epo:definesContractDuration" modelElement="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_BEDB_63334B745ECB" x="1180" y="757" width="120" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_BEDB_63334B745ECB" text="0..1" modelElement="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_BEDB_63334B745ECB" x="1168" y="778" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_BEDB_63334B745ECB" x="1457" y="773"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_BEDB_63334B745ECB" x="1165" y="773"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_BE3B_872E1A0882C0" x="1592" y="647"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_BE3B_872E1A0882C0" x="1591" y="351"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_AFC8_89D40A9529FD" x="1153" y="839"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_AFC8_89D40A9529FD" x="1112" y="791"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_BBD0_75D03FADA8D8" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" modelElement="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_BBD0_75D03FADA8D8" text="+epo:definesPaymentExecutor" modelElement="EAID_dst1164A7_CB8C_462e_BBD0_75D03FADA8D8">
@@ -11802,6 +12580,16 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_9C9D_C9C33A874154" x="1503" y="647"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_9C9D_C9C33A874154" x="1503" y="541"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_B4C7_BC3E17610EF7" text="+epo:definesSpecificPlaceOfPerformance" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_B4C7_BC3E17610EF7" x="1783" y="786" width="165" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_B4C7_BC3E17610EF7" text="0..*" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_B4C7_BC3E17610EF7" x="1930" y="808" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_B4C7_BC3E17610EF7" x="1780" y="803"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_B4C7_BC3E17610EF7" x="1949" y="803"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_9F54_76A56333BE1E" text="+epo:definesPrize" modelElement="EAID_dst51F167_3C73_4e45_9F54_76A56333BE1E">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_9F54_76A56333BE1E" x="1162" y="545" width="72" height="14"/>
@@ -11812,30 +12600,19 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_9F54_76A56333BE1E" x="1199" y="531"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_9F54_76A56333BE1E" x="1199" y="586"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_854B_9995087470E4" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_854B_9995087470E4" text="+epo:definesContractPeriod" modelElement="EAID_dstA22183_A73E_42a1_854B_9995087470E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_854B_9995087470E4" x="1448" y="908" width="111" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_854B_9995087470E4" text="0..1" modelElement="EAID_dstA22183_A73E_42a1_854B_9995087470E4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_854B_9995087470E4" x="1508" y="943" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_854B_9995087470E4" x="1500" y="865"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_854B_9995087470E4" x="1500" y="961"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_B26B_232F5FB37A9C" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_B26B_232F5FB37A9C" text="+epo:hasQualificationSystemDuration" modelElement="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_B26B_232F5FB37A9C" x="845" y="746" width="152" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_BEDB_63334B745ECB" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_BEDB_63334B745ECB" text="+epo:definesContractDuration" modelElement="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_BEDB_63334B745ECB" x="1180" y="757" width="120" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_B26B_232F5FB37A9C" text="0..1" modelElement="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_B26B_232F5FB37A9C" x="980" y="772" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_BEDB_63334B745ECB" text="0..1" modelElement="EAID_dst1E8ADE_1698_4353_BEDB_63334B745ECB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_BEDB_63334B745ECB" x="1168" y="778" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_B26B_232F5FB37A9C" x="816" y="655"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_B26B_232F5FB37A9C" x="816" y="767"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_71D7_4074_B26B_232F5FB37A9C" x="999" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_BEDB_63334B745ECB" x="1457" y="773"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_BEDB_63334B745ECB" x="1165" y="773"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_AFC8_89D40A9529FD" x="1153" y="839"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_AFC8_89D40A9529FD" x="1112" y="791"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_A5CD_27AE1D84CDDE" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_A5CD_27AE1D84CDDE" x="899" y="532"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_A5CD_27AE1D84CDDE" x="974" y="351"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_AA82_ECF06C845021" x="1010" y="839"/>
@@ -11869,25 +12646,23 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_982A_26607071A85E" x="1203" y="433"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_982A_26607071A85E" x="1033" y="339"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_B4C7_BC3E17610EF7" text="+epo:definesSpecificPlaceOfPerformance" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_B4C7_BC3E17610EF7" x="1783" y="786" width="165" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_B4C7_BC3E17610EF7" text="0..*" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_B4C7_BC3E17610EF7" x="1930" y="808" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_B4C7_BC3E17610EF7" x="1780" y="803"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_B4C7_BC3E17610EF7" x="1949" y="803"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_993E_46C9ED67ADFA" source="EAID_44E7963D_28F5_4263_835A_24C87816F40C" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_993E_46C9ED67ADFA" x="1069" y="443"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_993E_46C9ED67ADFA" x="758" y="350"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_9E66_5EBEFD7759BC" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_9E66_5EBEFD7759BC" text="+epo:hasLaunchGroupFrameworkAgreementMaximumValue" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_9E66_5EBEFD7759BC" x="302" y="402" width="245" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_854B_9995087470E4" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_854B_9995087470E4" text="+epo:definesContractPeriod" modelElement="EAID_dstA22183_A73E_42a1_854B_9995087470E4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_854B_9995087470E4" x="1448" y="908" width="111" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_9E66_5EBEFD7759BC" text="0..1" modelElement="EAID_dstC50180_5437_4a3f_9E66_5EBEFD7759BC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_9E66_5EBEFD7759BC" x="302" y="425" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_854B_9995087470E4" text="0..1" modelElement="EAID_dstA22183_A73E_42a1_854B_9995087470E4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_854B_9995087470E4" x="1508" y="943" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_9E66_5EBEFD7759BC" x="556" y="420"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_9E66_5EBEFD7759BC" x="299" y="420"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_854B_9995087470E4" x="1500" y="865"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_854B_9995087470E4" x="1500" y="961"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_897A_253ACD64FC8A" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_897A_253ACD64FC8A" x="706" y="400"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_897A_253ACD64FC8A" x="706" y="370"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -11949,32 +12724,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_80BE_9C778A0BA2A5" x="985" y="192"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_80BE_9C778A0BA2A5" x="985" y="281"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_8BC2_8F80AD12DA02" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" modelElement="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_8BC2_8F80AD12DA02" x="1740" y="647"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_8BC2_8F80AD12DA02" x="1740" y="560"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_71D7_4074_8BC2_8F80AD12DA02" x="1906" y="560"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_AD37_79213AD539C8" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_AD37_79213AD539C8" x="302" y="444" width="221" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_AD37_79213AD539C8" x="302" y="467" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_AD37_79213AD539C8" x="556" y="462"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_AD37_79213AD539C8" x="299" y="462"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_A5CD_27AE1D84CDDE" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" modelElement="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_A5CD_27AE1D84CDDE" x="899" y="531"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_A5CD_27AE1D84CDDE" x="974" y="351"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_BE3B_872E1A0882C0" x="1592" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_BE3B_872E1A0882C0" x="1591" y="351"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_B20C_514E7B961066" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_2EEC390D_B44F_4505_8179_765B845FE27F" modelElement="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_B20C_514E7B961066" x="614" y="475"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_B20C_514E7B961066" x="614" y="547"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_897A_253ACD64FC8A" source="EAID_FA070646_D88B_493f_96AB_8417E2069155" target="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" modelElement="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_897A_253ACD64FC8A" x="706" y="400"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_897A_253ACD64FC8A" x="706" y="370"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_8BC2_8F80AD12DA02" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" modelElement="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_8BC2_8F80AD12DA02" x="1740" y="647"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_8BC2_8F80AD12DA02" x="1740" y="560"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_71D7_4074_8BC2_8F80AD12DA02" x="1906" y="560"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_98F9_263E29761C37" x="792" y="400"/>
@@ -11992,6 +12753,18 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_9472_AFC131D1E7F2" x="1794" y="309"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_9472_AFC131D1E7F2" x="1638" y="309"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_AD37_79213AD539C8" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_AD37_79213AD539C8" text="+epo:hasLaunchFrameworkAgreementMaximumValue" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_AD37_79213AD539C8" x="101" y="312" width="221" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_AD37_79213AD539C8" text="0..1" modelElement="EAID_dst416646_B3CA_4c57_AD37_79213AD539C8">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_AD37_79213AD539C8" x="230" y="370" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_AD37_79213AD539C8" x="1489" y="93"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_AD37_79213AD539C8" x="1489" y="45"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_71D7_4074_AD37_79213AD539C8" x="222" y="45"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_71D7_4074_AD37_79213AD539C8" x="222" y="388"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_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_71D7_4074_A39E_E74480CCE1D0" text="+epo:foreseesContractSpecificTerm" modelElement="EAID_dst463DF7_672E_4208_A39E_E74480CCE1D0">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_A39E_E74480CCE1D0" x="1508" y="241" width="142" height="14"/>
@@ -12002,6 +12775,17 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_A39E_E74480CCE1D0" x="1589" y="230"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_A39E_E74480CCE1D0" x="1589" y="281"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_B26B_232F5FB37A9C" source="EAID_3F572668_3AED_4090_BAB3_9047B4874154" target="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" modelElement="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_B26B_232F5FB37A9C" text="+epo:hasQualificationSystemDuration" modelElement="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_B26B_232F5FB37A9C" x="845" y="746" width="152" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_71D7_4074_B26B_232F5FB37A9C" text="0..1" modelElement="EAID_dstDCE7F5_7EC7_4537_B26B_232F5FB37A9C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_71D7_4074_B26B_232F5FB37A9C" x="980" y="772" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_71D7_4074_B26B_232F5FB37A9C" x="816" y="656"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_71D7_4074_B26B_232F5FB37A9C" x="816" y="767"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_71D7_4074_B26B_232F5FB37A9C" x="999" y="767"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_C9FE03EA_71D7_4074_8AE5_E5806C9B2562" source="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" target="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" modelElement="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_71D7_4074_8AE5_E5806C9B2562" text="+epo:isSubjectToContractSpecificTerm" modelElement="EAID_dstB9AB7E_2B60_4f59_8AE5_E5806C9B2562">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_71D7_4074_8AE5_E5806C9B2562" x="1388" y="294" width="153" height="14"/>
@@ -12174,7 +12958,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_BD3D_7F41689C651B" modelElement="EAID_02014F61_A766_467e_BD3D_7F41689C651B">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_BD3D_7F41689C651B" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_BD3D_7F41689C651B" text="at-voc:number-threshold"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BD3D_7F41689C651B" x="1073" y="500" width="96" height="65"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BD3D_7F41689C651B" x="1105" y="238" width="96" height="65"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_A833_0CAE48C1A9B8" modelElement="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_A833_0CAE48C1A9B8" text="enumeration"/>
@@ -12183,7 +12967,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="907" y="441" width="90" height="42"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BF42_2A6E50CAF4E6" x="1023" y="473" width="171" height="62"/>
 			</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"/>
@@ -12214,7 +12998,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_8952_6A9F572F43B2" modelElement="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_8952_6A9F572F43B2" text="cccev:InformationConcept"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_8952_6A9F572F43B2" x="1331" y="387" width="174" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_8952_6A9F572F43B2" x="1381" y="353" width="174" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_8BC0_71EA7F9C3122" modelElement="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_8BC0_71EA7F9C3122" text="epo:SelectionCriterion"/>
@@ -12230,12 +13014,12 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_8C41_DD186A53D6A9" text="cccev:Evidence"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_8C41_DD186A53D6A9" x="1242" y="165" width="90" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_8C41_DD186A53D6A9" x="1261" y="182" width="90" height="34"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_AAF4_E0FAB88D85EE" modelElement="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_AAF4_E0FAB88D85EE" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_AAF4_E0FAB88D85EE" text="at-voc:confidentiality-level"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_AAF4_E0FAB88D85EE" x="1242" y="293" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_AAF4_E0FAB88D85EE" x="1261" y="303" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_B795_B4D7DEE0BA53" modelElement="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_B795_B4D7DEE0BA53" text="epo:Tenderer"/>
@@ -12252,7 +13036,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_BA1D_59D180B6F8A1" modelElement="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_BA1D_59D180B6F8A1" text="cccev:Constraint"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BA1D_59D180B6F8A1" x="1022" y="398" width="197" height="48"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BA1D_59D180B6F8A1" x="1023" y="363" width="197" height="48"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_54EAF048_1D0D_46d6_97FA_8DD2F8F1AD20" modelElement="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_97FA_8DD2F8F1AD20" text="ProxyConnector"/>
@@ -12260,7 +13044,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_AD7B_7484B8FDA398" text="adms:Identifier"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_AD7B_7484B8FDA398" x="1309" y="500" width="216" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_AD7B_7484B8FDA398" x="1360" y="473" width="216" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_BE65_B3A78C349AC2" modelElement="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_BE65_B3A78C349AC2" text="enumeration"/>
@@ -12269,7 +13053,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_54EAF048_1D0D_46d6_BBB5_EC6BE02F8DBD" modelElement="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_BBB5_EC6BE02F8DBD" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BBB5_EC6BE02F8DBD" x="923" y="409" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_BBB5_EC6BE02F8DBD" x="923" y="374" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_54EAF048_1D0D_46d6_AC1E_A0960D618FE6" modelElement="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1D0D_46d6_AC1E_A0960D618FE6" text="enumeration"/>
@@ -12289,74 +13073,10 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1D0D_46d6_99E1_9F2BC2B995BD" text="epo:QualificationCriterion"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1D0D_46d6_99E1_9F2BC2B995BD" x="626" y="627" width="144" height="34"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_93D5_612F44B8ECE4" source="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" target="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" modelElement="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_93D5_612F44B8ECE4" x="998" y="715"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_93D5_612F44B8ECE4" x="998" y="644"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_93D5_612F44B8ECE4" x="770" y="644"/>
-			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_A7F5_548146C45BC4" x="824" y="520" width="119" height="27"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_A7F5_548146C45BC4" x="810" y="551" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_A7F5_548146C45BC4" x="951" y="565"/>
-				<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="807" y="546"/>
-			</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="818" y="482" width="119" height="27"/>
-				</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="810" y="518" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B087_27A619B6C819" x="950" y="483"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B087_27A619B6C819" x="950" y="513"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_B087_27A619B6C819" x="807" y="513"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8277_F34E55D2B1A0" source="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" target="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" modelElement="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8277_F34E55D2B1A0" x="399" y="658"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8277_F34E55D2B1A0" x="399" y="750"/>
-			</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"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BFCB_B139EAFC4E19" x="251" y="747"/>
 			</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>
-			<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="696" y="710"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D25_C40F0E038224" x="696" y="661"/>
-			</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>
-			<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_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_1D0D_46d6_A80D_69ACBFA6147C" x="631" y="473"/>
-				<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_9563_4C96020D607C" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" modelElement="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_9563_4C96020D607C" text="+epo:hasConstraint" modelElement="EAID_dst5C20FC_D382_4766_9563_4C96020D607C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_9563_4C96020D607C" x="942" y="398" width="78" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_9563_4C96020D607C" text="0..*" modelElement="EAID_dst5C20FC_D382_4766_9563_4C96020D607C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_9563_4C96020D607C" x="1003" y="421" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9563_4C96020D607C" x="760" y="473"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9563_4C96020D607C" x="760" y="416"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_9563_4C96020D607C" x="1022" y="416"/>
-			</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="635" y="789" width="142" height="14"/>
@@ -12367,42 +13087,83 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_87D7_D2C5E8C7FFF8" x="700" y="826"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_87D7_D2C5E8C7FFF8" x="700" y="769"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_9563_4C96020D607C" source="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" target="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" modelElement="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_9563_4C96020D607C" text="+epo:hasConstraint" modelElement="EAID_dst5C20FC_D382_4766_9563_4C96020D607C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_9563_4C96020D607C" x="943" y="363" width="78" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_9563_4C96020D607C" text="0..*" modelElement="EAID_dst5C20FC_D382_4766_9563_4C96020D607C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_9563_4C96020D607C" x="1004" y="386" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9563_4C96020D607C" x="760" y="473"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9563_4C96020D607C" x="760" y="381"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_9563_4C96020D607C" x="1023" y="381"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_A80D_69ACBFA6147C" x="631" y="473"/>
+				<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_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_8012_8F091434E4D3" source="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" target="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2" modelElement="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8012_8F091434E4D3" x="1076" y="752"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8012_8F091434E4D3" x="1175" y="752"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_8012_8F091434E4D3" x="1175" y="793"/>
 			</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="697" y="627"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D8D_679E9486EE84" x="697" y="563"/>
+			<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_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_93D5_612F44B8ECE4" source="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" target="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" modelElement="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_93D5_612F44B8ECE4" x="998" y="715"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_93D5_612F44B8ECE4" x="998" y="644"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_93D5_612F44B8ECE4" x="770" y="644"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_BFBF_00E3B99864B4" x="525" y="599"/>
-				<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 xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_8277_F34E55D2B1A0" source="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" target="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1" modelElement="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8277_F34E55D2B1A0" x="399" y="658"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8277_F34E55D2B1A0" x="399" y="750"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_AA0D_15C3CB11CC0C" source="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_AA0D_15C3CB11CC0C" text="+adms:identifier" modelElement="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1370" y="465" width="36" height="27"/>
+			<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="1253" y="491" width="105" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_AA0D_15C3CB11CC0C" text="0..1" modelElement="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1419" y="482" width="17" height="14"/>
+				<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="1341" y="514" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1411" y="457"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AA0D_15C3CB11CC0C" x="1411" y="500"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AEBA_EA277D05F7E8" x="1194" y="509"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AEBA_EA277D05F7E8" x="1360" y="509"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_BF53_F99082792332" x="688" y="294"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BF53_F99082792332" x="688" y="207"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BF53_F99082792332" x="858" y="207"/>
+			<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="830" y="482" 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="810" y="510" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_B087_27A619B6C819" x="1023" y="505"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B087_27A619B6C819" x="807" y="505"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_B88A_A418F4281BF1" x="560" y="331"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B88A_A418F4281BF1" x="492" y="331"/>
+			<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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_A7F5_548146C45BC4" x="825" y="529" width="142" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_A7F5_548146C45BC4" text="0..*" modelElement="EAID_dst1AA305_6E1E_4123_A7F5_548146C45BC4">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_A7F5_548146C45BC4" x="810" y="551" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_A7F5_548146C45BC4" x="951" y="565"/>
+				<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="807" y="546"/>
+			</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="696" y="710"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D25_C40F0E038224" x="696" y="661"/>
 			</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">
@@ -12418,58 +13179,101 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1D0D_46d6_BFBB_56453EA7473F" x="1012" y="235"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1D0D_46d6_BFBB_56453EA7473F" x="1012" y="235"/>
 			</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="1117" y="446"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AF48_1EE54018D9E5" x="1117" y="500"/>
-			</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="1258" y="404" width="71" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_AA04_83E4BB664FCB" text="+cccev:supportsConcept" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AA04_83E4BB664FCB" x="1419" y="317" width="97" 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="1312" y="427" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_AA04_83E4BB664FCB" text="0..*" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AA04_83E4BB664FCB" x="1476" y="335" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8A68_8655E9F9B47E" x="1219" y="422"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8A68_8655E9F9B47E" x="1331" y="422"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AA04_83E4BB664FCB" x="1351" y="198"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AA04_83E4BB664FCB" x="1468" y="198"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_AA04_83E4BB664FCB" x="1468" y="353"/>
 			</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="1055" y="398"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BCBE_35DFB0CE066A" x="1055" y="235"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_94C4_FD1CAF5CCC27" source="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" target="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" modelElement="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_94C4_FD1CAF5CCC27" x="930" y="416"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_94C4_FD1CAF5CCC27" x="943" y="285"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_919A_46302D44059E" x="1304" y="216"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_919A_46302D44059E" x="1304" y="303"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_9B78_BA9B3F1E9FF6" text="+cccev:supportsRequirement" modelElement="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1077" y="182" width="116" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1077" y="181" width="116" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_9B78_BA9B3F1E9FF6" text="0..*" modelElement="EAID_dst204966_4BC2_452d_9B78_BA9B3F1E9FF6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1078" y="211" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1078" y="210" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1242" y="200"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1074" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1261" y="199"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_9B78_BA9B3F1E9FF6" x="1074" y="199"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_919A_46302D44059E" x="1285" y="235"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_919A_46302D44059E" x="1285" y="293"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_94C4_FD1CAF5CCC27" source="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" target="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" modelElement="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_94C4_FD1CAF5CCC27" x="930" y="381"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_94C4_FD1CAF5CCC27" x="943" y="285"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_AA04_83E4BB664FCB" text="+cccev:supportsConcept" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AA04_83E4BB664FCB" x="1367" y="351" width="97" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_AA04_83E4BB664FCB" text="0..*" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AA04_83E4BB664FCB" x="1424" y="369" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AA04_83E4BB664FCB" x="1332" y="208"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AA04_83E4BB664FCB" x="1416" y="208"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_AA04_83E4BB664FCB" x="1416" y="387"/>
+			<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="1055" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BCBE_35DFB0CE066A" x="1055" y="235"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_A3A2_FA8F430848B1" source="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" target="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" modelElement="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_A3A2_FA8F430848B1" x="1076" y="729"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_A3A2_FA8F430848B1" x="1175" y="729"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_A3A2_FA8F430848B1" x="1175" y="692"/>
 			</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="1155" y="363"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AF48_1EE54018D9E5" x="1155" 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="697" y="627"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8D8D_679E9486EE84" x="697" y="563"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_A0A9_C1CCAB84A53A" source="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_527F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_A0A9_C1CCAB84A53A" text="+adms:identifier" modelElement="EAID_dst7F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_A0A9_C1CCAB84A53A" x="1535" y="442" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_A0A9_C1CCAB84A53A" text="0..1" modelElement="EAID_dst7F57B4_08F1_4183_A0A9_C1CCAB84A53A">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_A0A9_C1CCAB84A53A" x="1575" y="455" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_A0A9_C1CCAB84A53A" x="1074" y="167"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_A0A9_C1CCAB84A53A" x="1567" y="167"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_A0A9_C1CCAB84A53A" x="1567" y="473"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_B88A_A418F4281BF1" x="560" y="331"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_B88A_A418F4281BF1" x="492" y="331"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_BF53_F99082792332" x="688" y="294"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_BF53_F99082792332" x="688" y="207"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1D0D_46d6_BF53_F99082792332" x="858" y="207"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_AA0D_15C3CB11CC0C" source="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1D0D_46d6_AA0D_15C3CB11CC0C" text="+adms:identifier" modelElement="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1419" y="438" width="66" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1D0D_46d6_AA0D_15C3CB11CC0C" text="0..1" modelElement="EAID_dstC75333_AC70_477b_AA0D_15C3CB11CC0C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1468" y="455" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_AA0D_15C3CB11CC0C" x="1460" y="423"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_AA0D_15C3CB11CC0C" x="1460" y="473"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_54EAF048_1D0D_46d6_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_1D0D_46d6_BFBF_00E3B99864B4" x="525" y="599"/>
+				<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_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_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="1308" y="369" 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="1362" y="392" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1D0D_46d6_8A68_8655E9F9B47E" x="1220" y="387"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1D0D_46d6_8A68_8655E9F9B47E" x="1381" y="387"/>
+			</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">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_663B1240_A872_4795_B5F3_1BED9F96AB90" modelElement="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
@@ -12752,6 +13556,130 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A872_4795_B375_3B680C3FD97A" x="370" y="595"/>
 			</ownedElement>
 		</umldi:Diagram>
+		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_275A3D5B_4FDD_464a_96B4_853DDB16EA89" isFrame="false" modelElement="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334">
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_847A_7E8C5EEC0432" text="epo:Period"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_847A_7E8C5EEC0432" x="378" y="56" width="176" height="85"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_8A6D_3BF200CB4A3C" modelElement="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_8A6D_3BF200CB4A3C" text="epo:CertificationLabel"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_8A6D_3BF200CB4A3C" x="666" y="332" width="202" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_A9E4_B33CA4DA4C39" modelElement="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_A9E4_B33CA4DA4C39" text="epo:Certificate"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_A9E4_B33CA4DA4C39" x="319" y="332" width="215" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_99E7_B387A7B402A1" modelElement="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_99E7_B387A7B402A1" text="epo:Certifier"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_99E7_B387A7B402A1" x="125" y="332" width="90" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_9FFD_8653AC16BD03" modelElement="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_4FDD_464a_9FFD_8653AC16BD03" text="enumeration"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_9FFD_8653AC16BD03" text="at-voc-new:certification-label-type"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_9FFD_8653AC16BD03" x="693" y="478" width="149" height="48"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_8952_6A9F572F43B2" modelElement="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_8952_6A9F572F43B2" text="cccev:InformationConcept"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_8952_6A9F572F43B2" x="675" y="202" width="185" height="70"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_8C41_DD186A53D6A9" modelElement="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_8C41_DD186A53D6A9" text="cccev:Evidence"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_8C41_DD186A53D6A9" x="421" y="219" width="90" height="35"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_275A3D5B_4FDD_464a_B4DC_76817402265D" modelElement="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_B4DC_76817402265D" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_B4DC_76817402265D" x="553" y="361" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_275A3D5B_4FDD_464a_A9D6_A8B08A5ACBD7" modelElement="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_A9D6_A8B08A5ACBD7" text="ProxyConnector"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_A9D6_A8B08A5ACBD7" x="553" y="229" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_957E_CAC97A45CD53" modelElement="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_957E_CAC97A45CD53" text="foaf:Person"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_957E_CAC97A45CD53" x="229" y="195" width="90" height="48"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_275A3D5B_4FDD_464a_81DD_DA4802D8A322" modelElement="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4FDD_464a_81DD_DA4802D8A322" text="org:Organization"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4FDD_464a_81DD_DA4802D8A322" x="300" y="465" width="253" height="124"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_98F1_B3229B558EC4" source="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" target="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" modelElement="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_98F1_B3229B558EC4" x="560" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_98F1_B3229B558EC4" x="560" y="236"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_9F2B_CD75C658FF42" source="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" target="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" modelElement="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FDD_464a_9F2B_CD75C658FF42" text="+epo:hasCertification" modelElement="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_9F2B_CD75C658FF42" x="395" y="431" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_9F2B_CD75C658FF42" text="0..*" modelElement="EAID_dst1BEE04_A51F_434f_9F2B_CD75C658FF42">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_9F2B_CD75C658FF42" x="445" y="404" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_9F2B_CD75C658FF42" x="438" y="465"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_9F2B_CD75C658FF42" x="438" y="402"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_B5EB_19C2D921F4D1" source="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" target="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" modelElement="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FDD_464a_B5EB_19C2D921F4D1" text="+epo:hasCertification" modelElement="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_B5EB_19C2D921F4D1" x="306" y="297" width="85" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_B5EB_19C2D921F4D1" text="0..*" modelElement="EAID_dst8900B2_4B2A_411b_B5EB_19C2D921F4D1">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_B5EB_19C2D921F4D1" x="376" y="317" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_B5EB_19C2D921F4D1" x="319" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_B5EB_19C2D921F4D1" x="362" y="215"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4FDD_464a_B5EB_19C2D921F4D1" x="362" y="332"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_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_4FDD_464a_AA04_83E4BB664FCB" text="+cccev:supportsConcept" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_AA04_83E4BB664FCB" x="576" y="218" width="97" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_AA04_83E4BB664FCB" text="0..*" modelElement="EAID_dst90AB87_7AAE_4276_AA04_83E4BB664FCB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_AA04_83E4BB664FCB" x="656" y="241" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_AA04_83E4BB664FCB" x="511" y="236"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_AA04_83E4BB664FCB" x="675" y="236"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_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_4FDD_464a_829F_004DFE769A97" text="+epo:hasValidityPeriod" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_829F_004DFE769A97" x="420" y="171" width="93" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_829F_004DFE769A97" text="0..1" modelElement="EAID_dst64913C_FE85_48db_829F_004DFE769A97">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_829F_004DFE769A97" x="482" y="146" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_829F_004DFE769A97" x="470" y="219"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_829F_004DFE769A97" x="470" y="141"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_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_4FDD_464a_9A77_C246A6F21E71" text="+epo:issuedByCertifier" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_9A77_C246A6F21E71" x="225" y="352" width="90" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_9A77_C246A6F21E71" text="0..1" modelElement="EAID_dst176015_1FBF_4d9c_9A77_C246A6F21E71">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_9A77_C246A6F21E71" x="218" y="374" width="17" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_9A77_C246A6F21E71" x="319" y="369"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_9A77_C246A6F21E71" x="215" y="369"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_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_4FDD_464a_AEDA_E49049545B3B" x="465" y="332"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_AEDA_E49049545B3B" x="465" y="254"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_8357_6957359310FB" source="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" target="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" modelElement="EAID_C3BED690_3A74_4118_8357_6957359310FB">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4FDD_464a_8357_6957359310FB" text="+epo:attestedByLabel" modelElement="EAID_dstBED690_3A74_4118_8357_6957359310FB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4FDD_464a_8357_6957359310FB" x="575" y="348" width="88" height="14"/>
+				</ownedElement>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4FDD_464a_8357_6957359310FB" text="1" modelElement="EAID_dstBED690_3A74_4118_8357_6957359310FB">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4FDD_464a_8357_6957359310FB" x="658" y="373" width="6" height="14"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_8357_6957359310FB" x="534" y="368"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_8357_6957359310FB" x="666" y="368"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_9426_333EF3B4B423" source="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" target="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" modelElement="EAID_B62DE754_3523_45c7_9426_333EF3B4B423">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_9426_333EF3B4B423" x="767" y="402"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_9426_333EF3B4B423" x="767" y="478"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_275A3D5B_4FDD_464a_BE0E_772ACFDB16C5" source="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" target="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" modelElement="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4FDD_464a_BE0E_772ACFDB16C5" x="768" y="332"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4FDD_464a_BE0E_772ACFDB16C5" x="768" y="272"/>
+			</ownedElement>
+		</umldi:Diagram>
 		<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"/>
@@ -13308,15 +14236,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6C96B347_4D8D_4680_A95B_AE374D603608" modelElement="EAID_6966846F_842F_4149_A95B_AE374D603608">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4D8D_4680_A95B_AE374D603608" text="epo:SelectedCandidateList"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_A95B_AE374D603608" x="667" y="760" width="114" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_A95B_AE374D603608" x="675" y="737" width="114" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6C96B347_4D8D_4680_ADAC_88A2D6017C32" modelElement="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4D8D_4680_ADAC_88A2D6017C32" text="epo:Candidate"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_ADAC_88A2D6017C32" x="856" y="660" width="90" height="43"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_ADAC_88A2D6017C32" x="687" y="647" width="90" height="43"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6C96B347_4D8D_4680_847A_7E8C5EEC0432" modelElement="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4D8D_4680_847A_7E8C5EEC0432" text="epo:Period"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_847A_7E8C5EEC0432" x="371" y="760" width="181" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_4D8D_4680_847A_7E8C5EEC0432" x="371" y="737" width="181" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_6C96B347_4D8D_4680_B5F3_1BED9F96AB90" modelElement="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_4D8D_4680_B5F3_1BED9F96AB90" text="epo:ExclusionGround"/>
@@ -13356,13 +14284,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_A7A9_407855E7F1B8" source="EAID_6966846F_842F_4149_A95B_AE374D603608" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_ED4865EB_995F_486e_A7A9_407855E7F1B8">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4D8D_4680_A7A9_407855E7F1B8" text="+epo:hasStartDate" modelElement="EAID_dst4865EB_995F_486e_A7A9_407855E7F1B8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_A7A9_407855E7F1B8" x="565" y="780" width="76" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_A7A9_407855E7F1B8" x="565" y="757" width="76" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4D8D_4680_A7A9_407855E7F1B8" text="0..1" modelElement="EAID_dst4865EB_995F_486e_A7A9_407855E7F1B8">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_A7A9_407855E7F1B8" x="555" y="800" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_A7A9_407855E7F1B8" x="555" y="777" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_A7A9_407855E7F1B8" x="667" y="795"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_A7A9_407855E7F1B8" x="552" y="795"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_A7A9_407855E7F1B8" x="675" y="772"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_A7A9_407855E7F1B8" x="552" y="772"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_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_4D8D_4680_9458_83E0C40CEC9A" x="1011" y="538"/>
@@ -13410,15 +14338,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_8994_841365A27FAB" source="EAID_3780AA50_D898_4068_B300_47B46651CA0A" target="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" modelElement="EAID_DE5098A6_B134_4261_8994_841365A27FAB">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4D8D_4680_8994_841365A27FAB" text="+epo:hasValidityPeriod" modelElement="EAID_dst5098A6_B134_4261_8994_841365A27FAB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8994_841365A27FAB" x="276" y="779" width="93" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8994_841365A27FAB" x="276" y="756" width="93" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4D8D_4680_8994_841365A27FAB" text="0..1" modelElement="EAID_dst5098A6_B134_4261_8994_841365A27FAB">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8994_841365A27FAB" x="348" y="809" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8994_841365A27FAB" x="348" y="786" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_8994_841365A27FAB" x="375" y="570"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_8994_841365A27FAB" x="122" y="570"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4D8D_4680_8994_841365A27FAB" x="122" y="797"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4D8D_4680_8994_841365A27FAB" x="371" y="797"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4D8D_4680_8994_841365A27FAB" x="122" y="774"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_4D8D_4680_8994_841365A27FAB" x="371" y="774"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_9244_87A3BCAC0065" source="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" target="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" modelElement="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_9244_87A3BCAC0065" x="373" y="668"/>
@@ -13436,14 +14364,13 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_8CC4_DA85F79E7124" source="EAID_6966846F_842F_4149_A95B_AE374D603608" target="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" modelElement="EAID_007753B6_365D_4082_8CC4_DA85F79E7124">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4D8D_4680_8CC4_DA85F79E7124" text="+epo:containsCandidate" modelElement="EAID_dst7753B6_365D_4082_8CC4_DA85F79E7124">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8CC4_DA85F79E7124" x="852" y="730" width="97" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8CC4_DA85F79E7124" x="683" y="717" width="97" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4D8D_4680_8CC4_DA85F79E7124" text="0..*" modelElement="EAID_dst7753B6_365D_4082_8CC4_DA85F79E7124">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8CC4_DA85F79E7124" x="913" y="708" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8CC4_DA85F79E7124" x="744" y="695" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_8CC4_DA85F79E7124" x="781" y="762"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_8CC4_DA85F79E7124" x="901" y="762"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4D8D_4680_8CC4_DA85F79E7124" x="901" y="703"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_8CC4_DA85F79E7124" x="732" y="737"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_8CC4_DA85F79E7124" x="732" y="690"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_B751_1F0998CC86A7" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_3780AA50_D898_4068_B300_47B46651CA0A" modelElement="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4D8D_4680_B751_1F0998CC86A7" text="+epo:usesTechnique" modelElement="EAID_dstE68ED4_8A73_411c_B751_1F0998CC86A7">
@@ -13501,14 +14428,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_8310_43761AC8295C" source="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" target="EAID_6966846F_842F_4149_A95B_AE374D603608" modelElement="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_4D8D_4680_8310_43761AC8295C" text="+epo:resultsFromUsingCandidateList" modelElement="EAID_dstF2D4DC_7ED0_457c_8310_43761AC8295C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8310_43761AC8295C" x="793" y="771" width="146" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_4D8D_4680_8310_43761AC8295C" x="801" y="748" width="146" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_4D8D_4680_8310_43761AC8295C" text="0..1" modelElement="EAID_dstF2D4DC_7ED0_457c_8310_43761AC8295C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8310_43761AC8295C" x="788" y="800" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_4D8D_4680_8310_43761AC8295C" x="796" y="777" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_8310_43761AC8295C" x="1419" y="596"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_8310_43761AC8295C" x="1419" y="789"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4D8D_4680_8310_43761AC8295C" x="781" y="789"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_4D8D_4680_8310_43761AC8295C" x="1419" y="766"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_4D8D_4680_8310_43761AC8295C" x="789" y="766"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_6C96B347_4D8D_4680_A7C8_604097CB9B2E" source="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" target="EAID_3780AA50_D898_4068_B300_47B46651CA0A" modelElement="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_4D8D_4680_A7C8_604097CB9B2E" x="460" y="633"/>
@@ -13641,14 +14568,14 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CB9AE4FA_A6CB_4260_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_A6CB_4260_9195_C96F98BD3349" text="+epo:hasProcurementScopeDividedIntoLot" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A6CB_4260_9195_C96F98BD3349" x="578" y="326" width="171" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_A6CB_4260_9195_C96F98BD3349" x="595" y="334" width="171" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_A6CB_4260_9195_C96F98BD3349" text="1..*" modelElement="EAID_dst990D3C_51ED_4626_9195_C96F98BD3349">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A6CB_4260_9195_C96F98BD3349" x="723" y="370" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_A6CB_4260_9195_C96F98BD3349" x="721" y="370" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A6CB_4260_9195_C96F98BD3349" x="628" y="215"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A6CB_4260_9195_C96F98BD3349" x="715" y="215"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A6CB_4260_9195_C96F98BD3349" x="715" y="388"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_A6CB_4260_9195_C96F98BD3349" x="628" y="216"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_A6CB_4260_9195_C96F98BD3349" x="713" y="216"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_A6CB_4260_9195_C96F98BD3349" x="713" y="388"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_CB9AE4FA_A6CB_4260_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_A6CB_4260_8F66_FA023FA190E7" text="+epo:hasLotReference" modelElement="EAID_dstCFA3D8_50E1_40f7_8F66_FA023FA190E7">
@@ -13776,84 +14703,68 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_F40E_4a51_BE33_620A29646687" text="epo:AwardOutcome"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_F40E_4a51_BE33_620A29646687" x="553" y="227" width="202" height="124"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_8978_7B6F899FD855" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_8978_7B6F899FD855" text="+epo:hasFrameworkAgreementEstimatedValue" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_8978_7B6F899FD855" x="502" y="475" width="14" height="192"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_AB89_9342AF882E95" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_AB89_9342AF882E95" text="+epo:summarisesInformationForAwardOutcome" modelElement="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_AB89_9342AF882E95" x="348" y="305" width="195" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_8978_7B6F899FD855" text="0..1" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_8978_7B6F899FD855" x="528" y="664" width="17" height="14"/>
+				<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_8978_7B6F899FD855" x="520" y="459"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_8978_7B6F899FD855" x="520" y="682"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_AB89_9342AF882E95" x="329" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_AB89_9342AF882E95" x="329" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_AB89_9342AF882E95" x="553" y="325"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_BB1A_167306D6B16C" text="+epo:hasBargainPrice" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_BB1A_167306D6B16C" x="770" y="705" width="87" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_86E7_B4E433F87208" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_86E7_B4E433F87208" x="327" y="740" width="155" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_BB1A_167306D6B16C" text="0..1" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_BB1A_167306D6B16C" x="754" y="731" width="17" height="14"/>
+				<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_BB1A_167306D6B16C" x="755" y="262"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BB1A_167306D6B16C" x="1136" y="262"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_BB1A_167306D6B16C" x="1136" y="726"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_F40E_4a51_BB1A_167306D6B16C" x="751" y="726"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_86E7_B4E433F87208" x="258" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_86E7_B4E433F87208" x="258" y="758"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_86E7_B4E433F87208" x="484" y="758"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_83E6_3CAF530D5403" text="+epo:comprisesTenderAwardOutcome" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_83E6_3CAF530D5403" x="779" y="294" width="155" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_94D7_26E6E451AF0C" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_94D7_26E6E451AF0C" text="+epo:hasLowestReceivedTenderValue" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_94D7_26E6E451AF0C" x="329" y="706" width="153" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_83E6_3CAF530D5403" text="0..*" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_83E6_3CAF530D5403" x="914" y="326" width="17" height="14"/>
+				<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_83E6_3CAF530D5403" x="755" y="315"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_83E6_3CAF530D5403" x="934" y="315"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_94D7_26E6E451AF0C" x="290" y="664"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_94D7_26E6E451AF0C" x="290" y="724"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_94D7_26E6E451AF0C" x="484" y="724"/>
 			</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">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_82EA_14ABA20458B6" x="770" y="745" width="97" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_A14D_2E0BE4C98649" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
+				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_A14D_2E0BE4C98649" text="+epo:signsAwardDecision" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_A14D_2E0BE4C98649" x="405" y="118" width="103" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_82EA_14ABA20458B6" text="0..1" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_82EA_14ABA20458B6" x="754" y="766" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_A14D_2E0BE4C98649" text="0..*" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_A14D_2E0BE4C98649" x="498" y="144" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_82EA_14ABA20458B6" x="755" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_82EA_14ABA20458B6" x="1156" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_82EA_14ABA20458B6" x="1156" y="761"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_F40E_4a51_82EA_14ABA20458B6" x="751" y="761"/>
-			</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="242"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B489_096BF3AE570A" x="283" y="242"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_9BBA_3C0E1D4E25A8" x="861" y="397"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_9BBA_3C0E1D4E25A8" x="861" y="336"/>
-				<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_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="289"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BCAE_F8C1CC7880E0" x="283" y="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_A14D_2E0BE4C98649" x="386" y="139"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_A14D_2E0BE4C98649" x="517" y="139"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_910B_A28B233CEB46" x="563" y="510" width="14" height="137"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_B11C_CBD651205C58" text="+epo:comprisesAwardOutcome" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_B11C_CBD651205C58" x="580" y="184" width="127" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_910B_A28B233CEB46" x="590" y="664" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_B11C_CBD651205C58" text="0..*" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_B11C_CBD651205C58" x="645" y="209" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_910B_A28B233CEB46" x="581" y="459"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_910B_A28B233CEB46" x="582" y="562"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_910B_A28B233CEB46" x="582" y="682"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_B11C_CBD651205C58" x="637" y="177"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B11C_CBD651205C58" x="637" y="227"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_AB89_9342AF882E95" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_E7437025_771F_4143_BE33_620A29646687" modelElement="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_AB89_9342AF882E95" text="+epo:summarisesInformationForAwardOutcome" modelElement="EAID_dstBE64C7_3F6B_4881_AB89_9342AF882E95">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_AB89_9342AF882E95" x="348" y="305" width="195" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_A6DC_62DFC84C122D" x="623" y="471" width="14" height="203"/>
 				</ownedElement>
-				<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 xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_A6DC_62DFC84C122D" text="0..1" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_A6DC_62DFC84C122D" x="658" y="664" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_AB89_9342AF882E95" x="329" y="397"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_AB89_9342AF882E95" x="329" y="325"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_AB89_9342AF882E95" x="553" y="325"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_A6DC_62DFC84C122D" x="650" y="459"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_A6DC_62DFC84C122D" x="650" y="682"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_8D8A_71BD69D25161" text="+epo:hasFrameworkAgreementMaximumValue" modelElement="EAID_dst87247C_598C_4f96_8D8A_71BD69D25161">
@@ -13865,61 +14776,56 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_8D8A_71BD69D25161" x="724" y="459"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_8D8A_71BD69D25161" x="724" y="682"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_A6DC_62DFC84C122D" text="+epo:hasApproximateFrameworkAgreementValue" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_A6DC_62DFC84C122D" x="623" y="471" width="14" height="203"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_A6DC_62DFC84C122D" text="0..1" modelElement="EAID_dst7619CE_95A4_4f77_A6DC_62DFC84C122D">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_A6DC_62DFC84C122D" x="658" y="664" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_A6DC_62DFC84C122D" x="650" y="459"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_A6DC_62DFC84C122D" x="650" y="682"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_8EBE_A60BD8ED070A" x="636" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_8EBE_A60BD8ED070A" x="636" y="351"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_B11C_CBD651205C58" text="+epo:comprisesAwardOutcome" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_B11C_CBD651205C58" x="580" y="184" width="127" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_B11C_CBD651205C58" text="0..*" modelElement="EAID_dst215D61_0282_4111_B11C_CBD651205C58">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_B11C_CBD651205C58" x="645" y="209" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_B11C_CBD651205C58" x="637" y="177"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B11C_CBD651205C58" x="637" y="227"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_9BBA_3C0E1D4E25A8" x="861" y="397"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_9BBA_3C0E1D4E25A8" x="861" y="336"/>
+				<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_A14D_2E0BE4C98649" source="EAID_96B284C4_E759_4bad_9655_04521F703750" target="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" modelElement="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_A14D_2E0BE4C98649" text="+epo:signsAwardDecision" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_A14D_2E0BE4C98649" x="405" y="118" width="103" height="14"/>
+			<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="242"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_B489_096BF3AE570A" x="283" 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">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_82EA_14ABA20458B6" x="770" y="745" width="97" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_A14D_2E0BE4C98649" text="0..*" modelElement="EAID_dst57D84E_2B82_485f_A14D_2E0BE4C98649">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_A14D_2E0BE4C98649" x="498" y="144" width="17" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_82EA_14ABA20458B6" text="0..1" modelElement="EAID_dst7A511C_F377_4405_82EA_14ABA20458B6">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_82EA_14ABA20458B6" x="754" y="766" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_A14D_2E0BE4C98649" x="386" y="139"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_A14D_2E0BE4C98649" x="517" y="139"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_82EA_14ABA20458B6" x="755" y="244"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_82EA_14ABA20458B6" x="1156" y="244"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_82EA_14ABA20458B6" x="1156" y="761"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_F40E_4a51_82EA_14ABA20458B6" x="751" y="761"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_94D7_26E6E451AF0C" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_94D7_26E6E451AF0C" text="+epo:hasLowestReceivedTenderValue" modelElement="EAID_dstD513D4_9622_4217_94D7_26E6E451AF0C">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_94D7_26E6E451AF0C" x="329" y="706" width="153" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_83E6_3CAF530D5403" text="+epo:comprisesTenderAwardOutcome" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_83E6_3CAF530D5403" x="779" y="294" width="155" height="14"/>
 				</ownedElement>
-				<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 xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_83E6_3CAF530D5403" text="0..*" modelElement="EAID_dst4C01E9_6CF5_410f_83E6_3CAF530D5403">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_83E6_3CAF530D5403" x="914" y="326" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_94D7_26E6E451AF0C" x="290" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_94D7_26E6E451AF0C" x="290" y="724"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_94D7_26E6E451AF0C" x="484" y="724"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_83E6_3CAF530D5403" x="755" y="315"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_83E6_3CAF530D5403" x="934" y="315"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_86E7_B4E433F87208" source="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_3127E296_9886_44bc_86E7_B4E433F87208">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_F40E_4a51_86E7_B4E433F87208" text="+epo:hasHighestReceivedTenderValue" modelElement="EAID_dst27E296_9886_44bc_86E7_B4E433F87208">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_86E7_B4E433F87208" x="327" y="740" width="155" height="14"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_BA4823EC_F40E_4a51_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_F40E_4a51_BB1A_167306D6B16C" text="+epo:hasBargainPrice" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_F40E_4a51_BB1A_167306D6B16C" x="770" y="705" width="87" height="14"/>
 				</ownedElement>
-				<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 xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_F40E_4a51_BB1A_167306D6B16C" text="0..1" modelElement="EAID_dst57E7B8_BA32_4888_BB1A_167306D6B16C">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_F40E_4a51_BB1A_167306D6B16C" x="754" y="731" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_86E7_B4E433F87208" x="258" y="664"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_86E7_B4E433F87208" x="258" y="758"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_86E7_B4E433F87208" x="484" y="758"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_F40E_4a51_BB1A_167306D6B16C" x="755" y="262"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BB1A_167306D6B16C" x="1136" y="262"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_F40E_4a51_BB1A_167306D6B16C" x="1136" y="726"/>
+				<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_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_F40E_4a51_8EBE_A60BD8ED070A" x="636" y="397"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_8EBE_A60BD8ED070A" x="636" y="351"/>
+			<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="289"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_F40E_4a51_BCAE_F8C1CC7880E0" x="283" y="289"/>
 			</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">
@@ -13943,7 +14849,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DF65_4cef_8EA6_28768E083EED" x="573" y="627" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5C2AE103_DF65_4cef_9D1A_0FFBB894F5CC" modelElement="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DF65_4cef_9D1A_0FFBB894F5CC" text="epo:NoticeChangeInformation"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DF65_4cef_9D1A_0FFBB894F5CC" text="epo:ChangeInformation"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DF65_4cef_9D1A_0FFBB894F5CC" x="1377" y="350" width="283" height="101"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5C2AE103_DF65_4cef_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
@@ -13984,7 +14890,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DF65_4cef_B8A4_6F969F59938C" x="1396" y="86" width="245" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5C2AE103_DF65_4cef_8C71_E7FB3B4F88F0" modelElement="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DF65_4cef_8C71_E7FB3B4F88F0" text="epo:ContextSpecificDescription"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_DF65_4cef_8C71_E7FB3B4F88F0" text="epo:ContextDescription"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_DF65_4cef_8C71_E7FB3B4F88F0" x="940" y="106" width="108" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_5C2AE103_DF65_4cef_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
@@ -14091,8 +14997,10 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DF65_4cef_8B13_015B01092BC2" x="1034" y="176"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5C2AE103_DF65_4cef_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_DF65_4cef_B76D_8B1B3FFE038A" x="1801" y="154"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DF65_4cef_B76D_8B1B3FFE038A" x="1048" y="141"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DF65_4cef_B76D_8B1B3FFE038A" x="1853" y="121"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DF65_4cef_B76D_8B1B3FFE038A" x="1853" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_DF65_4cef_B76D_8B1B3FFE038A" x="992" y="35"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_DF65_4cef_B76D_8B1B3FFE038A" x="992" y="106"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5C2AE103_DF65_4cef_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_DF65_4cef_ADDD_37AEDF27D9E0" x="881" y="238"/>
@@ -14100,10 +15008,10 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5C2AE103_DF65_4cef_8B7C_0A19B505F52F" source="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DF65_4cef_8B7C_0A19B505F52F" text="+epo:concernsNotice" modelElement="EAID_dstEA813D_50A9_4b54_8B7C_0A19B505F52F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DF65_4cef_8B7C_0A19B505F52F" x="1644" y="138" width="139" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DF65_4cef_8B7C_0A19B505F52F" x="1644" y="138" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DF65_4cef_8B7C_0A19B505F52F" text="1" modelElement="EAID_dstEA813D_50A9_4b54_8B7C_0A19B505F52F">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DF65_4cef_8B7C_0A19B505F52F" x="1644" y="161" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DF65_4cef_8B7C_0A19B505F52F" x="1644" y="161" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DF65_4cef_8B7C_0A19B505F52F" x="1801" y="156"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DF65_4cef_8B7C_0A19B505F52F" x="1641" y="156"/>
@@ -14189,10 +15097,10 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_5C2AE103_DF65_4cef_BB7E_A40906D6ED97" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_DF65_4cef_BB7E_A40906D6ED97" text="+epo:concernsNotice" modelElement="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DF65_4cef_BB7E_A40906D6ED97" x="1452" y="205" width="140" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_DF65_4cef_BB7E_A40906D6ED97" x="1452" y="205" width="84" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_DF65_4cef_BB7E_A40906D6ED97" text="1" modelElement="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DF65_4cef_BB7E_A40906D6ED97" x="1468" y="231" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_DF65_4cef_BB7E_A40906D6ED97" x="1468" y="231" width="6" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_DF65_4cef_BB7E_A40906D6ED97" x="1456" y="350"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_DF65_4cef_BB7E_A40906D6ED97" x="1456" y="226"/>
@@ -14270,7 +15178,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B51B_9E700090C968" x="1135" y="325" 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:NoticeChangeInformation"/>
+				<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"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_94AC_B4EC57A6B248" modelElement="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
@@ -14306,7 +15214,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_5004_4cc0_B4D4_D8AE4F96B00B" x="1954" y="175" 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:ContextSpecificDescription"/>
+				<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"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_9733D0B6_5004_4cc0_A531_93ABFC476500" modelElement="EAID_92AE6E92_3A20_4642_A531_93ABFC476500">
@@ -14435,8 +15343,8 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2ACB_45b8_B8A4_6F969F59938C" x="168" y="94" width="245" height="150"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9A67D0E_2ACB_45b8_8C71_E7FB3B4F88F0" modelElement="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2ACB_45b8_8C71_E7FB3B4F88F0" text="epo:ContextSpecificDescription"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2ACB_45b8_8C71_E7FB3B4F88F0" x="606" y="219" width="108" height="70"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2ACB_45b8_8C71_E7FB3B4F88F0" text="epo:ContextDescription"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_2ACB_45b8_8C71_E7FB3B4F88F0" x="592" y="254" width="136" height="35"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_F9A67D0E_2ACB_45b8_80B0_0C345D6703F4" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_2ACB_45b8_80B0_0C345D6703F4" text="epo:Procedure"/>
@@ -14511,7 +15419,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_B8A4_6F969F59938C" modelElement="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_B8A4_6F969F59938C" text="epo:Notice"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B8A4_6F969F59938C" x="71" y="214" width="245" height="153"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B8A4_6F969F59938C" x="108" y="208" width="245" height="153"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_A5D5_16A78AB06A11" modelElement="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_A5D5_16A78AB06A11" text="epo:ExpressionOfInterest"/>
@@ -14519,7 +15427,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B217_37E957B3B448" x="599" y="71" width="187" height="137"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B217_37E957B3B448" x="599" y="71" width="195" height="137"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_A8D0_545E069052CC" modelElement="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_A8D0_545E069052CC" text="epo:RequestForClarification"/>
@@ -14527,11 +15435,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_83ABA0C5_B381_42ca_B0EA_B6FB8B5C8EB6" modelElement="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_B0EA_B6FB8B5C8EB6" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B0EA_B6FB8B5C8EB6" x="339" y="227" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B0EA_B6FB8B5C8EB6" x="376" y="221" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_AE98_14D4AF1A77C1" modelElement="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_AE98_14D4AF1A77C1" text="epo:TechnicalSpecification"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_AE98_14D4AF1A77C1" x="232" y="467" width="187" height="30"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_9787_B6F389BACA6B" modelElement="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_9787_B6F389BACA6B" text="epo:RequestForParticipation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_9787_B6F389BACA6B" x="1050" y="356" width="125" height="28"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_9787_B6F389BACA6B" x="1050" y="356" width="125" height="55"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_A912_95FF3EA9C6FF" modelElement="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_A912_95FF3EA9C6FF" text="epo:Offer"/>
@@ -14539,7 +15451,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B8D8_207479C15419" x="434" y="311" width="219" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_B8D8_207479C15419" x="435" y="322" width="219" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_95C9_B8B685B22E32" modelElement="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_95C9_B8B685B22E32" text="epo:ReviewDecision"/>
@@ -14559,15 +15471,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_8372_75A07B6AB066" modelElement="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_8372_75A07B6AB066" text="epo:Contract"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_8372_75A07B6AB066" x="1165" y="192" width="216" height="70"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_8372_75A07B6AB066" x="1040" y="138" width="216" height="70"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_83ABA0C5_B381_42ca_9BAC_28A7FEB05838" modelElement="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_B381_42ca_9BAC_28A7FEB05838" text="epo:OriginatorRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_B381_42ca_9BAC_28A7FEB05838" x="911" y="356" width="115" height="28"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_BE12_0A7FCD4C34D2" x="949" y="356"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_BE12_0A7FCD4C34D2" x="773" y="208"/>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B308_C0F08C743DCF" x="1040" y="174"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B308_C0F08C743DCF" x="794" y="156"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_8018_10297955785C" text="+epo:associatedWith 0..*" modelElement="EAID_dstF3583F_0D40_4e9f_8018_10297955785C">
@@ -14586,37 +15498,37 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B72E_BC6C99FF3009" text="+epo:hasElectronicDigest 0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B381_42ca_B72E_BC6C99FF3009" x="805" y="128" width="119" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_B381_42ca_B72E_BC6C99FF3009" x="813" y="128" width="119" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B381_42ca_B72E_BC6C99FF3009" text="0..*" modelElement="EAID_dstE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B381_42ca_B72E_BC6C99FF3009" x="789" y="122" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B381_42ca_B72E_BC6C99FF3009" x="797" y="122" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_B72E_BC6C99FF3009" x="786" y="142"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B72E_BC6C99FF3009" x="786" y="142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_B72E_BC6C99FF3009" x="794" y="142"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B72E_BC6C99FF3009" x="794" y="142"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B381_42ca_B72E_BC6C99FF3009" x="817" y="142"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B381_42ca_B72E_BC6C99FF3009" x="817" y="117"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B381_42ca_B72E_BC6C99FF3009" x="786" y="117"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B381_42ca_B72E_BC6C99FF3009" x="786" y="117"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B381_42ca_B72E_BC6C99FF3009" x="794" y="117"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B381_42ca_B72E_BC6C99FF3009" x="794" y="117"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_AB35_766470760473" source="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_DCD1791D_6597_41ef_AB35_766470760473">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_AB35_766470760473" x="1055" y="291"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_AB35_766470760473" x="786" y="184"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_AB35_766470760473" x="1056" y="291"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_AB35_766470760473" x="794" y="186"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_94A0_32241C0F50CE" x="316" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_94A0_32241C0F50CE" x="599" y="169"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_94A0_32241C0F50CE" x="353" y="239"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_94A0_32241C0F50CE" x="599" y="171"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_95A0_E058E0BD5450" x="331" y="395"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_95A0_E058E0BD5450" x="599" y="186"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_95A0_E058E0BD5450" x="599" y="188"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_8821_DE0368FF9C47" source="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_8821_DE0368FF9C47" x="749" y="339"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_8821_DE0368FF9C47" x="712" y="208"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_8821_DE0368FF9C47" x="715" y="208"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_9C04_7ED2CC31BA99" source="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_9C04_7ED2CC31BA99" x="1084" y="356"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_9C04_7ED2CC31BA99" x="786" y="200"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_9C04_7ED2CC31BA99" x="1063" y="356"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_9C04_7ED2CC31BA99" x="794" y="202"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
@@ -14625,45 +15537,49 @@
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_B381_42ca_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_B381_42ca_B8FF_34E21440DAD9" x="760" y="66" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_B8FF_34E21440DAD9" x="786" y="100"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B8FF_34E21440DAD9" x="786" y="100"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_B8FF_34E21440DAD9" x="794" y="100"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B8FF_34E21440DAD9" x="794" y="100"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_B381_42ca_B8FF_34E21440DAD9" x="815" y="100"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_B381_42ca_B8FF_34E21440DAD9" x="815" y="46"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_B381_42ca_B8FF_34E21440DAD9" x="752" y="46"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_B381_42ca_B8FF_34E21440DAD9" x="752" y="71"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000006_B381_42ca_B8FF_34E21440DAD9" x="752" y="71"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B308_C0F08C743DCF" x="1165" y="220"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B308_C0F08C743DCF" x="786" y="162"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B8A1_C090490D5878" x="968" y="526"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B8A1_C090490D5878" x="968" y="473"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_BE12_0A7FCD4C34D2" x="949" y="356"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_BE12_0A7FCD4C34D2" x="776" y="208"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_B845_A73F67127C06" x="1049" y="246"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B845_A73F67127C06" x="786" y="173"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B845_A73F67127C06" x="794" y="174"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_8FA6_A01D070F8819" source="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" target="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" modelElement="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_8FA6_A01D070F8819" x="346" y="234"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_8FA6_A01D070F8819" x="383" y="228"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_8FA6_A01D070F8819" x="604" y="41"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_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_B381_42ca_A3F4_443665C43EB4" x="565" y="311"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_A3F4_443665C43EB4" x="641" y="208"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_A3F4_443665C43EB4" x="566" y="322"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_A3F4_443665C43EB4" x="646" y="208"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_AA0C_F4AAB1D0346B" source="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" target="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" modelElement="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_AA0C_F4AAB1D0346B" x="852" y="526"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_AA0C_F4AAB1D0346B" x="852" y="473"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_961A_5B6B18435CAA" source="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_961A_5B6B18435CAA" x="895" y="411"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_961A_5B6B18435CAA" x="749" y="208"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_961A_5B6B18435CAA" x="896" y="411"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_961A_5B6B18435CAA" x="753" y="208"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_B74D_B5F732EECD28" source="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_B74D_B5F732EECD28" x="663" y="411"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B74D_B5F732EECD28" x="684" y="208"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_B74D_B5F732EECD28" x="687" y="208"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_83ABA0C5_B381_42ca_9895_20BF2C6316EF" source="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1" target="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" modelElement="EAID_A00448A7_8270_497c_9895_20BF2C6316EF">
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_B381_42ca_9895_20BF2C6316EF" x="325" y="467"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_B381_42ca_9895_20BF2C6316EF" x="325" y="428"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_86147DF4_1EF7_40c5_9C93_8A5889DDC756" isFrame="false" modelElement="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58">
@@ -14674,7 +15590,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_8217_0049EA327F90" modelElement="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1EF7_40c5_8217_0049EA327F90" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_8217_0049EA327F90" text="at-voc:language"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_8217_0049EA327F90" x="423" y="258" width="90" height="88"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_8217_0049EA327F90" x="470" y="258" width="90" height="88"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_9EC7_90D2BE971F58" modelElement="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_9EC7_90D2BE971F58" text="epo:AccessTerm"/>
@@ -14691,7 +15607,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_A283_99A69DAB2E4A" modelElement="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1EF7_40c5_A283_99A69DAB2E4A" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_A283_99A69DAB2E4A" text="at-voc:form-type"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A283_99A69DAB2E4A" x="445" y="386" width="90" height="52"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A283_99A69DAB2E4A" x="91" y="668" width="90" height="52"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_A8D0_545E069052CC" modelElement="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_A8D0_545E069052CC" text="epo:RequestForClarification"/>
@@ -14711,11 +15627,11 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_86147DF4_1EF7_40c5_B0EA_B6FB8B5C8EB6" modelElement="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_B0EA_B6FB8B5C8EB6" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_B0EA_B6FB8B5C8EB6" x="635" y="505" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_B0EA_B6FB8B5C8EB6" x="447" y="445" width="14" height="14"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_86147DF4_1EF7_40c5_A898_C99A5E4A62D6" modelElement="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_A898_C99A5E4A62D6" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A898_C99A5E4A62D6" x="656" y="212" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_A898_C99A5E4A62D6" x="642" y="211" width="14" height="14"/>
 			</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"/>
@@ -14732,7 +15648,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_B8D8_207479C15419" modelElement="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_B8D8_207479C15419" text="epo:Tender"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_B8D8_207479C15419" x="423" y="671" width="219" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_B8D8_207479C15419" x="454" y="658" width="219" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_BEC9_90381AD6D4F1" modelElement="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_BEC9_90381AD6D4F1" text="epo:ReviewObject"/>
@@ -14750,12 +15666,17 @@
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_1EF7_40c5_9BAC_28A7FEB05838" text="epo:OriginatorRequest"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_1EF7_40c5_9BAC_28A7FEB05838" x="1130" y="373" width="115" height="28"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_86147DF4_1EF7_40c5_A2CC_FA90C006C282" modelElement="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
+				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_1EF7_40c5_A2CC_FA90C006C282" text="enumeration"/>
+				<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="513" 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_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="639" y="671"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_A3F4_443665C43EB4" x="670" y="658"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_A3F4_443665C43EB4" x="796" y="386"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_961A_5B6B18435CAA" source="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA">
@@ -14814,25 +15735,25 @@
 			</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="513" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BA0E_2B284F62AB15" x="560" y="283"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_8AD5_971C71230DCF" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_8AD5_971C71230DCF" x="367" y="593"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_8AD5_971C71230DCF" x="181" y="593"/>
+			<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="593" y="214" width="103" height="14"/>
+					<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="249" width="100" height="10"/>
+					<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="663" y="194"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_8018_10297955785C" x="663" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_8018_10297955785C" x="693" y="244"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_8018_10297955785C" x="693" y="244"/>
+				<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">
@@ -14864,32 +15785,48 @@
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_1EF7_40c5_B219_FFD9D57F9B43" text="+epo:involvesProcurementDocument" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_1EF7_40c5_B219_FFD9D57F9B43" x="741" y="575" width="149" height="14"/>
 				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_B219_FFD9D57F9B43" text="1" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B219_FFD9D57F9B43" x="829" y="551" width="6" height="14"/>
+				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_1EF7_40c5_B219_FFD9D57F9B43" text="0..1" modelElement="EAID_dst1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_1EF7_40c5_B219_FFD9D57F9B43" x="829" y="551" width="17" height="14"/>
 				</ownedElement>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_B219_FFD9D57F9B43" x="817" y="632"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_B219_FFD9D57F9B43" x="817" y="546"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_8FA6_A01D070F8819" source="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" target="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" modelElement="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_8FA6_A01D070F8819" x="649" y="519"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_8FA6_A01D070F8819" x="656" y="519"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_8FA6_A01D070F8819" x="656" y="226"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_8FA6_A01D070F8819" x="461" y="445"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_8FA6_A01D070F8819" x="461" y="225"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_8FA6_A01D070F8819" x="642" y="225"/>
+			</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"/>
+				</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"/>
+				</ownedElement>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BE52_91F3F7270840" x="486" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BE52_91F3F7270840" x="486" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_BE52_91F3F7270840" x="486" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_1EF7_40c5_BE52_91F3F7270840" x="422" y="452"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_1EF7_40c5_BE52_91F3F7270840" x="422" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_1EF7_40c5_BE52_91F3F7270840" x="422" y="492"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_9CF4_9285C5C0CCEC" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_9CF4_9285C5C0CCEC" x="367" y="509"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_9CF4_9285C5C0CCEC" x="181" y="509"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_9CF4_9285C5C0CCEC" x="367" y="522"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_9CF4_9285C5C0CCEC" x="181" y="522"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_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_1EF7_40c5_A0B5_482CD2D1D30D" x="401" y="492"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_A0B5_482CD2D1D30D" x="401" y="404"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_1EF7_40c5_A0B5_482CD2D1D30D" x="181" y="404"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_9B27_A7A4C7B70604" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" modelElement="EAID_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_9B27_A7A4C7B70604" x="367" y="550"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_9B27_A7A4C7B70604" x="181" y="550"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_9B27_A7A4C7B70604" x="367" y="571"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_9B27_A7A4C7B70604" x="181" y="571"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_86147DF4_1EF7_40c5_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_1EF7_40c5_BD98_F885B35FD24B" x="493" y="492"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_1EF7_40c5_BD98_F885B35FD24B" x="493" y="438"/>
-			</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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_1EF7_40c5_BD98_F885B35FD24B" x="398" y="632"/>
+				<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">
@@ -15348,30 +16285,6 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B19_4a2a_8D8A_71BD69D25161" x="1239" y="224"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_9B19_4a2a_8D8A_71BD69D25161" x="1059" y="224"/>
 			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E8D8E631_9B19_4a2a_8978_7B6F899FD855" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B19_4a2a_8978_7B6F899FD855" text="+epo:hasFrameworkAgreementEstimatedValue" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B19_4a2a_8978_7B6F899FD855" x="1080" y="169" width="192" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B19_4a2a_8978_7B6F899FD855" text="0..1" modelElement="EAID_dst718222_A67E_4d16_8978_7B6F899FD855">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B19_4a2a_8978_7B6F899FD855" x="1062" y="194" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B19_4a2a_8978_7B6F899FD855" x="1058" y="559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B19_4a2a_8978_7B6F899FD855" x="1266" y="559"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B19_4a2a_8978_7B6F899FD855" x="1266" y="189"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_9B19_4a2a_8978_7B6F899FD855" x="1059" y="189"/>
-			</ownedElement>
-			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E8D8E631_9B19_4a2a_910B_A28B233CEB46" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" modelElement="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_9B19_4a2a_910B_A28B233CEB46" text="+epo:hasAwardedEstimatedValue" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_9B19_4a2a_910B_A28B233CEB46" x="1073" y="238" width="137" height="14"/>
-				</ownedElement>
-				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_9B19_4a2a_910B_A28B233CEB46" text="0..1" modelElement="EAID_dst29B069_584F_4a4f_910B_A28B233CEB46">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_9B19_4a2a_910B_A28B233CEB46" x="1064" y="267" width="17" height="14"/>
-				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_9B19_4a2a_910B_A28B233CEB46" x="1058" y="511"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B19_4a2a_910B_A28B233CEB46" x="1216" y="511"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_9B19_4a2a_910B_A28B233CEB46" x="1216" y="257"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_9B19_4a2a_910B_A28B233CEB46" x="1059" y="257"/>
-			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_E8D8E631_9B19_4a2a_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_9B19_4a2a_8447_5E708FAB9D5A" x="584" y="512"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_9B19_4a2a_8447_5E708FAB9D5A" x="584" y="424"/>
@@ -15721,8 +16634,8 @@
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_44A1640B_919A_4ad4_8024_B556ACED19B4" isFrame="false" modelElement="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D">
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_44A1640B_919A_4ad4_9D1A_0FFBB894F5CC" modelElement="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_9D1A_0FFBB894F5CC" text="epo:NoticeChangeInformation"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_9D1A_0FFBB894F5CC" x="515" y="283" width="283" height="111"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_9D1A_0FFBB894F5CC" text="epo:ChangeInformation"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_9D1A_0FFBB894F5CC" x="515" y="282" width="283" height="111"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_44A1640B_919A_4ad4_A94D_8DC872AE93F7" modelElement="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_919A_4ad4_A94D_8DC872AE93F7" text="enumeration"/>
@@ -15734,7 +16647,7 @@
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_B8A4_6F969F59938C" x="121" y="262" width="245" height="150"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_44A1640B_919A_4ad4_B47E_50C11AD87033" modelElement="EAID_98639C30_5207_4cc7_B47E_50C11AD87033">
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_B47E_50C11AD87033" x="564" y="154" width="187" height="62"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_B47E_50C11AD87033" x="563" y="200" width="187" height="62"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_44A1640B_919A_4ad4_AD7B_7484B8FDA398" modelElement="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_AD7B_7484B8FDA398" text="adms:Identifier"/>
@@ -15742,7 +16655,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_44A1640B_919A_4ad4_B217_37E957B3B448" modelElement="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_B217_37E957B3B448" text="epo:Document"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_B217_37E957B3B448" x="151" y="47" width="184" height="140"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_B217_37E957B3B448" x="146" y="47" width="195" height="140"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_44A1640B_919A_4ad4_B0EA_B6FB8B5C8EB6" modelElement="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_B0EA_B6FB8B5C8EB6" text="ProxyConnector"/>
@@ -15750,11 +16663,15 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLShape" xmi:id="EAID_44A1640B_919A_4ad4_A898_C99A5E4A62D6" modelElement="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_A898_C99A5E4A62D6" text="ProxyConnector"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_A898_C99A5E4A62D6" x="129" y="40" width="14" height="14"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_A898_C99A5E4A62D6" x="124" y="40" width="14" height="14"/>
+			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_44A1640B_919A_4ad4_A56C_6D68CD1BEAF3" modelElement="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_919A_4ad4_A56C_6D68CD1BEAF3" text="epo:ProcurementDocument"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_919A_4ad4_A56C_6D68CD1BEAF3" x="562" y="78" width="191" height="53"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_934C_F1F1D556AA5A" source="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" target="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" modelElement="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_934C_F1F1D556AA5A" x="656" y="216"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_934C_F1F1D556AA5A" x="656" y="283"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_934C_F1F1D556AA5A" x="656" y="262"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_934C_F1F1D556AA5A" x="656" y="282"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_BB7E_A40906D6ED97" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_919A_4ad4_BB7E_A40906D6ED97" text="+epo:concernsNotice" modelElement="EAID_dst14464A_EF1A_4230_BB7E_A40906D6ED97">
@@ -15768,27 +16685,27 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_ACA6_A903591C3651" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" modelElement="EAID_84490705_94B3_445f_ACA6_A903591C3651">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_919A_4ad4_ACA6_A903591C3651" text="+epo:relatesToEFormSectionIdentifier" modelElement="EAID_dst490705_94B3_445f_ACA6_A903591C3651">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_ACA6_A903591C3651" x="351" y="480" width="148" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_ACA6_A903591C3651" x="351" y="480" width="152" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_919A_4ad4_ACA6_A903591C3651" text="1..*" modelElement="EAID_dst490705_94B3_445f_ACA6_A903591C3651">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_919A_4ad4_ACA6_A903591C3651" x="351" y="503" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_ACA6_A903591C3651" x="560" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_ACA6_A903591C3651" x="560" y="393"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_ACA6_A903591C3651" x="560" y="498"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_919A_4ad4_ACA6_A903591C3651" x="348" y="498"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_BC5F_08B65291C2AC" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" modelElement="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_919A_4ad4_BC5F_08B65291C2AC" text="+epo:refersToPreviousNotice" modelElement="EAID_dst3AE348_60D1_44cb_BC5F_08B65291C2AC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_BC5F_08B65291C2AC" x="386" y="303" width="116" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_BC5F_08B65291C2AC" x="386" y="302" width="116" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_919A_4ad4_BC5F_08B65291C2AC" text="1" modelElement="EAID_dst3AE348_60D1_44cb_BC5F_08B65291C2AC">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_919A_4ad4_BC5F_08B65291C2AC" x="369" y="326" width="6" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_919A_4ad4_BC5F_08B65291C2AC" x="369" y="325" width="6" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_BC5F_08B65291C2AC" x="515" y="321"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_BC5F_08B65291C2AC" x="366" y="321"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_BC5F_08B65291C2AC" x="515" y="320"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_BC5F_08B65291C2AC" x="366" y="320"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_B2AB_A1E3E26E726C" source="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" target="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" modelElement="EAID_B2FED202_9ACA_415c_B2AB_A1E3E26E726C">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_B2AB_A1E3E26E726C" x="656" y="394"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_B2AB_A1E3E26E726C" x="656" y="393"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_B2AB_A1E3E26E726C" x="656" y="474"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_94A0_32241C0F50CE" source="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" target="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" modelElement="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
@@ -15809,23 +16726,27 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_919A_4ad4_BE52_91F3F7270840" x="141" y="262"/>
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_919A_4ad4_BE52_91F3F7270840" x="141" y="262"/>
 			</ownedElement>
+			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_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_919A_4ad4_95A0_E058E0BD5450" x="562" y="104"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_95A0_E058E0BD5450" x="341" y="104"/>
+			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_8FA6_A01D070F8819" source="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" target="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" modelElement="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819">
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_8FA6_A01D070F8819" x="173" y="238"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_8FA6_A01D070F8819" x="136" y="47"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_8FA6_A01D070F8819" x="131" y="47"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_44A1640B_919A_4ad4_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_919A_4ad4_B8FF_34E21440DAD9" text="+epo:refersToPrevious 0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_B8FF_34E21440DAD9" x="126" y="29" width="109" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_919A_4ad4_B8FF_34E21440DAD9" x="121" y="29" width="109" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_919A_4ad4_B8FF_34E21440DAD9" text="0..*" modelElement="EAID_dstE11A54_45B0_449d_B8FF_34E21440DAD9">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_919A_4ad4_B8FF_34E21440DAD9" x="250" y="42" width="100" height="10"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_919A_4ad4_B8FF_34E21440DAD9" x="245" y="42" width="100" height="10"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_B8FF_34E21440DAD9" x="296" y="47"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_B8FF_34E21440DAD9" x="296" y="47"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_919A_4ad4_B8FF_34E21440DAD9" x="296" y="26"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_919A_4ad4_B8FF_34E21440DAD9" x="242" y="26"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_919A_4ad4_B8FF_34E21440DAD9" x="242" y="47"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_919A_4ad4_B8FF_34E21440DAD9" x="242" y="47"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_919A_4ad4_B8FF_34E21440DAD9" x="291" y="47"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_919A_4ad4_B8FF_34E21440DAD9" x="291" y="47"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_919A_4ad4_B8FF_34E21440DAD9" x="291" y="26"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_919A_4ad4_B8FF_34E21440DAD9" x="237" y="26"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000004_919A_4ad4_B8FF_34E21440DAD9" x="237" y="47"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000005_919A_4ad4_B8FF_34E21440DAD9" x="237" y="47"/>
 			</ownedElement>
 		</umldi:Diagram>
 		<umldi:Diagram xmi:type="umldi:UMLClassDiagram" xmi:id="EAID_20D8EECD_FA88_4280_8420_27FB07AFC138" isFrame="false" modelElement="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D">
@@ -16045,26 +16966,6 @@
 				<xrefs value="$XREFPROP=$XID={3C3936D9-4F4E-421e-9AAB-E78C2E850A83}$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={0B563D27-1575-48a5-8CFF-5424B393E918}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={41814422-3581-4590-B42E-25404E14526C}$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={0B563D27-1575-48a5-8CFF-5424B393E918}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
 				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_54EAF048_1D0D_46d6_BEFD_4B2213CD4887"/>
 			</element>
-			<element xmi:idref="EAID_0E2769F1_F27B_445a_A3EA_854B47E10131" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1865" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Text" nType="82" alias="tertiary roles hierarchy" scope="public" stereotype="NavigationCell"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:47:39" 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-88;"/>
-				<tags/>
-				<xrefs value="$XREFPROP=$XID={16D6C875-968E-417e-A1A0-B633972FD137}$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={0E2769F1-F27B-445a-A3EA-854B47E10131}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={58A1A5F2-41B7-40eb-950E-F117C3DCFA6D}$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={0E2769F1-F27B-445a-A3EA-854B47E10131}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-			</element>
-			<element xmi:idref="EAID_12170F5C_506A_44bf_A694_24FCCC3FFDA5" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1851" 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="2022-05-17 10:52:55" modified="2022-05-16 15:09:05" 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={00BA2B7B-070A-47a6-8B28-26FEF0ACC60F}$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={12170F5C-506A-44bf-A694-24FCCC3FFDA5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={E9F68BF6-C234-47c0-AF9F-C0869A0F15DF}$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={12170F5C-506A-44bf-A694-24FCCC3FFDA5}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-			</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"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="award" scope="public" stereotype="NavigationCell"/>
@@ -16115,16 +17016,6 @@
 				<xrefs value="$XREFPROP=$XID={FA7D495C-E8E9-4758-8449-8853EF15B87F}$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={307A886F-B089-4e24-95CC-EC9CC2A318DC}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={08D92035-E5BF-4a4d-9557-B4E6B577997E}$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={307A886F-B089-4e24-95CC-EC9CC2A318DC}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
 				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_C8C827E4_665B_43db_A783_8FBB5CAF08BE"/>
 			</element>
-			<element xmi:idref="EAID_31EA4D18_AE52_4312_865E_AA3D8CABF489" xmi:type="uml:Text" name="monetary value - competition" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1853" ea_eleType="element" name="monetary value - competition"/>
-				<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: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-35;"/>
-				<tags/>
-				<xrefs value="$XREFPROP=$XID={DC44677D-5410-4daf-802C-878B858FACEC}$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={31EA4D18-AE52-4312-865E-AA3D8CABF489}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={9233EF83-3912-4fbe-BC6C-7C4E9AC621C0}$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={31EA4D18-AE52-4312-865E-AA3D8CABF489}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology" diagram="EAID_8187914A_C8B4_4cd2_BE0C_83AFEE8CC0B5"/>
-			</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"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="datatype" scope="public" stereotype="NavigationCell"/>
@@ -16285,26 +17176,6 @@
 				<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"/>
 			</element>
-			<element xmi:idref="EAID_C51CEE38_0715_4c7f_A11A_33482161EFBA" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1864" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Text" nType="82" alias="secondary roles hierarchy" scope="public" stereotype="NavigationCell"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:47:26" 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-88;"/>
-				<tags/>
-				<xrefs value="$XREFPROP=$XID={C7D82AD4-6C7C-41c7-A5D6-CA97F74F0949}$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={C51CEE38-0715-4c7f-A11A-33482161EFBA}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={ACBE08E4-A77E-4058-909C-CF13C7791FDC}$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={C51CEE38-0715-4c7f-A11A-33482161EFBA}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-			</element>
-			<element xmi:idref="EAID_D328B002_DFC9_487f_A930_EAEFF23E8568" xmi:type="uml:Text" scope="public">
-				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1863" ea_eleType="element"/>
-				<properties isSpecification="false" sType="Text" nType="82" alias="primary roles hierarchy" scope="public" stereotype="NavigationCell"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-05-17 12:47:13" 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-88;"/>
-				<tags/>
-				<xrefs value="$XREFPROP=$XID={4F5B9861-3444-4e2d-BEE2-1AD916CE9B2C}$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={D328B002-DFC9-487f-A930-EAEFF23E8568}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;$XREFPROP=$XID={3AC3B0B0-93F7-43e8-8CC3-6D38B65B3871}$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={D328B002-DFC9-487f-A930-EAEFF23E8568}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
-			</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"/>
 				<properties isSpecification="false" sType="Text" nType="82" alias="competition" scope="public" stereotype="NavigationCell"/>
@@ -16355,10 +17226,10 @@
 				<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"/>
 			</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"/>
-				<properties isSpecification="false" sType="Text" nType="82" alias="monetary value - submission" scope="public" stereotype="NavigationCell"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-05-17 10:57:50" modified="2022-05-17 13:42:33" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1" xmi:type="uml:Text" name="$diagram://{4BA59459-2BE8-4a2a-9BD6-72CB34B74A87}" scope="public">
+				<model package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="0" ea_localid="1854" ea_eleType="element" name="$diagram://{4BA59459-2BE8-4a2a-9BD6-72CB34B74A87}"/>
+				<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-11 13:56:28" 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/>
@@ -16431,7 +17302,7 @@
 				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="monetary value" relatedlinks="idref1=EAID_547A511C_F377_4405_82EA_14ABA20458B6;idref2=EAID_1729B069_584F_4a4f_910B_A28B233CEB46;"/>
+				<extendedProperties tagged="0" package_name="monetary value" relatedlinks="idref1=EAID_547A511C_F377_4405_82EA_14ABA20458B6;idref2=;"/>
 			</element>
 			<element xmi:idref="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" xmi:type="uml:Package" name="phase oriented" scope="public">
 				<model package2="EAID_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" package="EAPK_B2FCDD6D_CDFF_4c8a_991C_50886860F38A" tpos="0" ea_localid="151" ea_eleType="package"/>
@@ -16447,19 +17318,6 @@
 				<times created="2022-05-13 14:39:49" modified="2022-05-13 14:39:49"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="0" ea_localid="3097" ea_eleType="element"/>
-				<properties documentation="To be removed since is from Notice module. &#xA;Should we make a relation from epo:Notice?&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-14 17:41:37" modified="2023-07-14 17:43: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="phase oriented"/>
-				<links>
-					<NoteLink xmi:id="EAID_A663CF6F_0B0E_47fa_B841_73C5D3CD3B56" start="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-				</links>
-			</element>
 			<element xmi:idref="EAID_81C81B52_091E_44a3_B615_FA2A1785469E" xmi:type="uml:Note" scope="public">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="0" ea_localid="3098" ea_eleType="element"/>
 				<properties documentation="should this be review?&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
@@ -16471,817 +17329,1760 @@
 				<extendedProperties tagged="0" package_name="phase oriented"/>
 			</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="2" ea_localid="114" ea_eleType="package"/>
+				<model package2="EAID_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-18 11:49:45" modified="2022-04-22 22:18: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="diagrams"/>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
 				<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="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" tpos="0" ea_localid="2090" ea_eleType="element"/>
-				<properties documentation="&lt;b&gt;Procedure/ PlannedProcurementPart / Lot&lt;/b&gt; are a conflation of three aspects into one:&#xA;- the procedural / process / game rules&#xA;- the object/scope/purpose of procurement&#xA;- the description of influences or additional information related to the procurement (isSME suitable, isUsingEuFunds, etc.)&#xA;&#xA;TODO: the definitions NEED to be aligned, for now, to cover all three aspects! Possibly in the future model a separation of concerns for higher clarity/accuracy. &#xA;&#xA;&#xA;Note:&#xA;The current procedure class is a conflation of the &quot;process&quot; description and &quot;whole procurement subject matter&quot;.&#xA;&#xA;TODO: revise this definition.&#xA;TODO: specify that all procedures have al least one lot. &#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-18 16:14:48" modified="2022-11-08 14:52:11" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" xmi:type="uml:Class" name="epo:Project" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-04-20 17:10: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="procurement object"/>
 				<links>
-					<NoteLink xmi:id="EAID_55FB6FB6_1605_4f39_BFBE_32CA1C1F5228" start="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<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"/>
 				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" xmi:type="uml:Class" name="epo:ProcurementObject" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:44: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"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
+				<attributes>
+					<attribute xmi:idref="EAID_DF5B1B42_9DD2_4e8d_A789_27EB4A9F5270" name="epo:isSMESuitable" scope="Public">
+						<initial/>
+						<documentation value="The Lot is suitable for small and medium enterprises (SMEs).&#xA;&#xA;Additional Information&#xA;&#xA;This allows the buyer to make emphasis on the fact that the procedure has been designed having SMEs in mind. This indicator is also to be reflected in the selection criteria.&#xA;&#xA;For example, number of employees and turnover are applicable to the definition of an SME.&#xA;&#xA;WG Approval 15/10/2019&#xA;"/>
+						<model ea_localid="2059" ea_guid="{DF5B1B42-9DD2-4e8d-A789-27EB4A9F5270}"/>
+						<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_AAB414E4_6B76_4724_850E_FD4E9D1A9A36" 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="1672" ea_guid="{AAB414E4-6B76-4724-850E-FD4E9D1A9A36}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" 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_81C8CC43_F9F3_4dbf_B86E_3117B7D59284" name="epo:isUsingEUFunds" scope="Public">
+						<initial/>
+						<documentation value="The procurement foresees funding by the Union.&#xA;&#xA;Additional Information:&#xA;The funding may cover the whole procurement or part of the procurement.&#xA;&#xA;For example the European Structural and Investment Funds or grants awarded by the European Union.&#xA;&#xA;"/>
+						<model ea_localid="2060" ea_guid="{81C8CC43-F9F3-4dbf-B86E-3117B7D59284}"/>
+						<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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_7963EE6A_6E17_4cc0_9D4D_F2B3BD7DDB82" name="epo:isCoveredByGPA" scope="Public">
+						<initial/>
+						<documentation value="Specifies whether the Agreement on Government Procurement (GPA) applies.&#xA;&#xA;Additional information: &#xA;The GPA aims to establish a multilateral framework of balanced rights and obligations relating to public contracts with a view to achieving the liberalization and expansion of world trade.&#xA;&#xA;This corresponds in the e Forms to BT-115	    GPA Coverage.&#xA;&#xA;WG Approval 15/10/2019&#xA;&#xA;"/>
+						<model ea_localid="1666" ea_guid="{7963EE6A-6E17-4cc0-9D4D-F2B3BD7DDB82}"/>
+						<properties type="xsd:boolean" 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>
+					<attribute xmi:idref="EAID_C4978D81_7036_4dff_887C_4784F26EE895" name="epo:isRecurrent" scope="Public">
+						<initial/>
+						<documentation value="The Procurement being notified is likely to be included in another procedure in the foreseeable future.&#xA;&#xA;Additional Information:&#xA;&#xA;For example, a regularly re-tendered municipal service. This does not include awarding multiple contracts within a single qualification system, framework agreement, or a dynamic purchasing system.&#xA;&#xA;This corresponds in eForms to BT-94 Recurrence.&#xA;&#xA;WG Approval 12/05/2020&#xA;"/>
+						<model ea_localid="2082" ea_guid="{C4978D81-7036-4dff-887C-4784F26EE895}"/>
+						<properties type="xsd:boolean" 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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_8F62A6D7_E2B5_4316_8B14_C02E3FA048F0" name="epo:hasRecurrenceDescription" scope="Public">
+						<initial/>
+						<documentation value="Any additional information about the recurrence of the Procurement.&#xA;&#xA;Additional Information:&#xA;For example estimated timing of the Procedure.&#xA;&#xA;This corresponds in eForms to BT-95 Recurrence Description.&#xA;&#xA;(WG approval 2019-01-16)&#xA;"/>
+						<model ea_localid="2083" ea_guid="{8F62A6D7-E2B5-4316-8B14-C02E3FA048F0}"/>
+						<properties type="rdf:PlainLiteral" 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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_9D9B9980_E3C9_4487_8DC0_2F870FD3CE34" name="epo:hasLegalBasisDescription" scope="Public">
+						<initial/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="6"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
+					<Association xmi:id="EAID_0F625CFF_139F_4712_8BB6_681888ACB178" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
+					<Dependency xmi:id="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
+					<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_818697AF_821C_40da_B5DE_D7ED82169378" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Association xmi:id="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+					<Association xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<Generalization xmi:id="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+					<Association xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Association xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Association xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Association xmi:id="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Generalization xmi:id="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Generalization xmi:id="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" tpos="0" ea_localid="2898" ea_eleType="element"/>
-				<properties documentation="based on eForms (BT-124) a Channel may differ per Lot&#xA;based on standard forms, a channel may differ per procedure" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-04-03 18:19:38" modified="2023-04-11 11:42:06" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" xmi:type="uml:Class" name="epo:Lot" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:44:43" 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="agent"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
 				<links>
-					<NoteLink xmi:id="EAID_0DF6152A_D2C0_4f8c_A6A9_A94ADE3ECB16" start="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					<Association xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<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_BE41CCFB_8495_440b_ADCE_908A980E0342" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Association xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<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_20B9978D_8D66_48ab_B3C3_6654ABB348DF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_34156914_725C_4a26_B380_6FDE59360DAF" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_3656734D_7238_4738_9F80_EC054ABA2E24" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_38A9CEA0_D542_4a11_AEA0_EC5F24CAF1A1" start="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<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_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_D9990D3C_51ED_4626_9195_C96F98BD3349" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
 				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" xmi:type="uml:Class" name="epo:PlannedProcurementPart" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:45:24" 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"/>
-				<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"/>
-			</element>
-			<element xmi:idref="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="3088" ea_eleType="element"/>
-				<properties documentation="Here we have roles that belong to other modules (check all).&#xA;Discuss whether we need to move them.&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-12 18:31:40" modified="2023-07-12 18:34: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="role"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
 				<links>
-					<NoteLink xmi:id="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE" start="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Generalization xmi:id="EAID_71953D29_84AD_4774_9664_258E887283AF" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+					<Association xmi:id="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<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_EB2AC560_378D_4c18_9647_0E2E150D7463" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" start="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+					<NoteLink xmi:id="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656" start="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+					<Association xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2106" ea_eleType="element"/>
-				<properties documentation="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." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-10-31 11:27:31" modified="2022-02-03 17:30:05" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" xmi:type="uml:Class" name="epo:Procedure" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:46:16" 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="role"/>
+				<tags>
+					<tag xmi:id="EAID_A806D67B_9FD6_443d_96C0_5C16D87CAE4A" name="skos:editorialNote" value="this is a note" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<tag xmi:id="EAID_80468605_06C0_4b54_BC3F_AE19F3C873F2" name="skos:Label@fr" value="this is a french label" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<tag xmi:id="EAID_197C3636_E54A_454d_979F_78BC36A23A76" name="skos:prefLabel@ro" value="this is a romanina" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+				</tags>
+				<xrefs value="$XREFPROP=$XID={452B37C3-EFC2-4781-A983-8D16A2F56F79}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$DES=@PROP=@NAME=isActive@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={8F3A6A54-584E-4f65-80B0-0C345D6703F4}$CLT;$ENDXREF;"/>
+				<extendedProperties tagged="0" package_name="procurement object" eventflags="LNK=6b05;"/>
+				<attributes>
+					<attribute xmi:idref="EAID_790B2918_2B58_40de_B8E7_6698AA589C5E" name="epo:isAccelerated" scope="Public">
+						<initial/>
+						<documentation value="Statement about  the fact that the procedure will be reduced due to a state of urgency.&#xA;&#xA;Additional Information&#xA;&#xA;This modifies the time limit for the receipt of requests to participate or the receipt of tenders.&#xA;&#xA;WG Approval 20/08/2019&#xA;"/>
+						<model ea_localid="1721" ea_guid="{790B2918-2B58-40de-B8E7-6698AA589C5E}"/>
+						<properties type="xsd:boolean" 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_8DBF2461_62A0_40d3_B39B_A3C66EAE9CD7" name="epo:hasAcceleratedProcedureJustification" scope="Public">
+						<initial/>
+						<documentation value="The reasons why the procedure is accelerated.&#xA;&#xA;Additional Information:&#xA;A procedure is accelerated to cover needs of extraordinary circumstances ie earthquake relief.&#xA;&#xA;WG Approval 09/06/2020&#xA;&#xA;"/>
+						<model ea_localid="1722" ea_guid="{8DBF2461-62A0-40d3-B39B-A3C66EAE9CD7}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="By Value" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_1237AF42_0ACB_4905_9E98_37EB4AD1C8CE" name="epo:hasMainFeature" scope="Public">
+						<initial/>
+						<documentation value="Main features of the procedure and information about where the full rules for the procedure can be found. &#xA;&#xA;Additional Information:&#xA;This information should be given when the procedure is not one of those mentioned in the procurement directives. This can be the case for example for concessions, for social and other specific services, and in case of voluntary publication of procurement procedures below the EU procurement thresholds."/>
+						<model ea_localid="1724" ea_guid="{1237AF42-0ACB-4905-9E98-37EB4AD1C8CE}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_DCB6F0F3_A5AA_4582_8838_5A6AE79C81A6" name="epo:isJointProcurement" scope="Public">
+						<initial/>
+						<documentation value="Multiple buyers procure together within the same procedure.&#xA;&#xA;Addition Information:&#xA;In case the joint procurement involves buyers from different countries, the national law is specified by the epo:hasCrossBorderLaw in the ProcedureTerm . "/>
+						<model ea_localid="2071" ea_guid="{DCB6F0F3-A5AA-4582-8838-5A6AE79C81A6}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="7"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_E1AF6ECF_E2E5_420f_B454_601D03392D27" name="epo:isDesignContest" scope="Public">
+						<initial/>
+						<documentation value="A competition which enables the buyer to acquire a  plan or design via a jury.&#xA;&#xA;Additional information: &#xA;Design contests have traditionally mostly been used in the fields of town and country planning, architecture and engineering or data processing, other purposes, such as to obtain plans for financial engineering &#xA;&#xA;The contest may include or not the award of prizes;&#xA;&#xA;WG approval 04-02-2021 "/>
+						<model ea_localid="1923" ea_guid="{E1AF6ECF-E2E5-420f-B454-601D03392D27}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="16"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_33CADDC4_3A87_4925_A302_795332661BE4" start="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" end="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
+					<Dependency xmi:id="EAID_169198B9_544A_4d67_9273_0F076E0C1306" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37"/>
+					<Association xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Association xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<Association xmi:id="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Generalization xmi:id="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<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_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_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"/>
+					<Association xmi:id="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2097" 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-10-31 11:27:06" modified="2022-08-25 15:02:00" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" xmi:type="uml:Class" name="epo:LotGroup" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:47: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="role"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
+				<attributes>
+					<attribute xmi:idref="EAID_111B13D0_49D1_4dc7_8B71_0B31EC8EEB86" name="dct:title" scope="Public">
+						<initial/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+						<model ea_localid="2449" ea_guid="{111B13D0-49D1-4dc7-8B71-0B31EC8EEB86}"/>
+						<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>
+					<attribute xmi:idref="EAID_173CC3A0_D7A4_446f_9BF4_D16B18C2D0C4" 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="2450" ea_guid="{173CC3A0-D7A4-446f-9BF4-D16B18C2D0C4}"/>
+						<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="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463" start="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
+					<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_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"/>
+					<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_FC7073E1_3362_472f_B087_27A619B6C819" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Association xmi:id="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+					<Association xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+					<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_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"/>
+					<Association xmi:id="EAID_DB36A935_6B61_49a0_A901_D1A6B9C4D5A7" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2104" ea_eleType="element"/>
-				<properties documentation="Context: &#xA;Issuing invoices, Credit notes&#xA;Could be performed by third parties on behalf of the seller. &#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:27:08" modified="2022-10-11 15:34:58" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" xmi:type="uml:Class" name="epo:ProcurementElement" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:47:24" 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="role"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
+				<attributes>
+					<attribute xmi:idref="EAID_CA1EEF88_2E9E_40ca_8D61_5175A4D36F9E" name="dct:title" scope="Public">
+						<initial/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
+						<model ea_localid="1669" ea_guid="{CA1EEF88-2E9E-40ca-8D61-5175A4D36F9E}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_DE1FA5B9_94C7_44ae_BA93_BC77CD3943C8" 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"/>
+						<model ea_localid="1665" ea_guid="{DE1FA5B9-94C7-44ae-BA93-BC77CD3943C8}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					<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_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Association xmi:id="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_71953D29_84AD_4774_9664_258E887283AF" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+					<Generalization xmi:id="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2103" ea_eleType="element"/>
-				<properties documentation="Context: Sending of Goods&#xA;e.g. Amazon" isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:27:08" modified="2022-08-25 16:16:59" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" xmi:type="uml:Class" name="epo:Purpose" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:47:43" 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="role"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
 				<links>
-					<NoteLink xmi:id="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B" start="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
+					<Association xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
+					<Dependency xmi:id="EAID_74371426_1670_46df_8526_5A4910F24815" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_E55F2451_5826_4907_B311_4F37313BAEF6"/>
+					<Dependency xmi:id="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_E55F2451_5826_4907_B311_4F37313BAEF6"/>
+					<Association xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
+					<Association xmi:id="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2098" 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-10-31 11:27:06" modified="2022-08-25 15:06:22" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" xmi:type="uml:Class" name="epo:TenderGroup" scope="public">
+				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" 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="2023-03-12 11:49: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="role"/>
+				<extendedProperties tagged="0" package_name="procurement object"/>
+				<attributes>
+					<attribute xmi:idref="EAID_56B00029_EF2C_47f3_9FB2_D2BCDA794426" name="dct:title" scope="Public">
+						<initial/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+						<model ea_localid="2451" ea_guid="{56B00029-EF2C-47f3-9FB2-D2BCDA794426}"/>
+						<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>
+					<attribute xmi:idref="EAID_425B4513_4A80_406f_BCA7_4059C49A272A" 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="2452" ea_guid="{425B4513-4A80-406f-BCA7-4059C49A272A}"/>
+						<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="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5" start="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
+					<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_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+					<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_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_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" xmi:type="uml:Package" name="role playing sides" scope="public">
-				<model package2="EAID_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="111" ea_eleType="package"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="3" ea_localid="91" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 22:53:16" modified="2022-04-25 15:25:08" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 16:16:31" modified="2022-04-29 16:46: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="role"/>
-				<packageproperties version="1.0"/>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<packageproperties version="1.0" tpos="3"/>
 				<paths/>
-				<times created="2022-01-17 22:53:16" modified="2022-04-25 15:25:08"/>
+				<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_B6085AA3_C98C_49fa_8FA0_069B51B180A2" xmi:type="uml:Package" name="role predecessor dependecies" scope="public">
-				<model package2="EAID_B6085AA3_C98C_49fa_8FA0_069B51B180A2" package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="95" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 13:52:10" modified="2022-04-25 15:25:00" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_48133D6A_BE44_43c9_A647_04650698EC95" xmi:type="uml:Class" name="cpov:PublicOrganisation" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-04-24 01:05: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="role"/>
-				<packageproperties version="1.0"/>
-				<paths/>
-				<times created="2022-01-16 13:52:10" modified="2022-04-25 15:25:00"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<links>
+					<Generalization xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" start="EAID_48133D6A_BE44_43c9_A647_04650698EC95" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" xmi:type="uml:Class" name="cpv:Person" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2022-06-15 16:57:46" 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="diagrams"/>
-				<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="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="2023-07-17 18:18: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"/>
-				<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"/>
-			</element>
-			<element xmi:idref="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2364" ea_eleType="element"/>
-				<properties documentation="Estimated dates are not really conditions and stipulations, they are not terms. We need to segregate the procedural/process information from the procurement-object information in the future. " isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-12-09 10:04:45" modified="2022-12-09 10:05: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="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_3AAE7D72_B79E_4eb4_80F0_5CA37EE9A9CC" name="foaf:name" scope="Public">
+						<initial/>
+						<documentation value="The complete name of the Person as one string."/>
+						<model ea_localid="1702" ea_guid="{3AAE7D72-B79E-4eb4-80F0-5CA37EE9A9CC}"/>
+						<properties type="rdf:PlainLiteral" 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="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_2FEA1955_9850_48d7_9727_2F95770EFD98" name="foaf:familyName" scope="Public">
+						<initial/>
+						<documentation value="The hereditary surname of a family.&#xA;"/>
+						<model ea_localid="1703" ea_guid="{2FEA1955-9850-48d7-9727-2F95770EFD98}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_610E9A03_95D6_4189_9498_4B6491677473" name="foaf:givenName" scope="Public">
+						<initial/>
+						<documentation value="The name(s) that identify the Person within a family with a common surname.&#xA;"/>
+						<model ea_localid="1704" ea_guid="{610E9A03-95D6-4189-9498-4B6491677473}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" 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_B886263C_9ACE_4eb3_AAA4_B695015AA072" name="person:patronymicName" scope="Public">
+						<initial/>
+						<documentation value="Name based on the given name of the Person's father.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1705" ea_guid="{B886263C-9ACE-4eb3-AAA4-B695015AA072}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_C9671A98_14E5_4c22_8CDF_B2A44D33AB17" name="dct:alternative" scope="Public">
+						<initial/>
+						<documentation value="Any name by which an individual is known other than their full name.&#xA;WG 09/11/2021"/>
+						<model ea_localid="1706" ea_guid="{C9671A98-14E5-4c22-8CDF-B2A44D33AB17}"/>
+						<properties type="rdf:PlainLiteral" 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="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_263C8A1F_B813_473e_B8A5_0B8FD9FC3485" name="person:birthName" scope="Public">
+						<initial/>
+						<documentation value="Family name of the Person given upon their birth.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1707" ea_guid="{263C8A1F-B813-473e-B8A5-0B8FD9FC3485}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="6"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_8CD78B10_2568_474b_B4FD_89DEF282507C" name="cv:birthDate" scope="Public">
+						<initial/>
+						<documentation value="The point in time on which the Person was born."/>
+						<model ea_localid="1708" ea_guid="{8CD78B10-2568-474b-B4FD-89DEF282507C}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_A521BACC_3593_49bc_AB31_246F04F34435" start="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<NoteLink xmi:id="EAID_D957499E_9DCB_46c9_BF9D_2D348A5961B1" start="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Association xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<Dependency xmi:id="EAID_677B606B_352C_459b_9644_C85CAC550728" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<Dependency xmi:id="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<Association xmi:id="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<Generalization xmi:id="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
+					<Association xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<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_1B056616_B822_4add_84D3_1D36186827ED" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2084" 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-10-04 15:39:41" modified="2022-10-04 15:39:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" xmi:type="uml:Class" name="epo:AdHocChannel" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-04-11 11:33: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="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
 				<links>
-					<Generalization xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" start="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" end="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
+					<Generalization xmi:id="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD" start="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_75629D1B_E406_4b38_82BA_5525819A470C" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2085" 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-10-04 15:39:56" modified="2022-10-04 15:39:56" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" xmi:type="uml:Class" name="epo:Business" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2021-12-21 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_F71CAE83_7EA2_4c52_90A8_0F254E9E77D7" name="epo:isListedCompany" scope="Public">
+						<initial/>
+						<documentation value="Public companies listed on a stock exchange and subject to disclosure requirements (either by stock exchange&#xA;rules or through law or enforceable means), which impose requirements to ensure adequate transparency of &#xA;beneficial ownership. &#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;&#xA;In eForms this indicator is used when the nationality of beneficial owner is not provided because the Economic Operator is registered in a regulated market that is subject to disclosure requirements consistent with Union law or subject to equivalent international standards which ensure adequate transparency of ownership information. &#xA;&#xA;WG Approval 21/11/2019"/>
+						<model ea_localid="1564" ea_guid="{F71CAE83-7EA2-4c52-90A8-0F254E9E77D7}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_9512B0DA_565A_4051_A589_525053877046" start="EAID_75629D1B_E406_4b38_82BA_5525819A470C" end="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
+					<Dependency xmi:id="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E"/>
+					<Association xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<Generalization xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2083" 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-10-04 15:39:41" modified="2022-10-04 15:39:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" xmi:type="uml:Class" name="epo:OrganisationGroup" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-04-24 01:04: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="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_BCE985B9_9499_473a_B5FA_2C4594C6B9A0" name="epo:hasGroupType" scope="Public">
+						<initial/>
+						<documentation value="Form of collaboration agreement between organisations.&#xA;&#xA;Additional Information:&#xA;This is not a legal type; not to be mistaken with epo:hasLegalFormType which may also be used for Organisation Groups.&#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1925" ea_guid="{BCE985B9-9499-473a-B5FA-2C4594C6B9A0}"/>
+						<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>
-					<Generalization xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" start="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" end="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
+					<Association xmi:id="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_D67F46E0_2B15_4614_A170_F1414A602530" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2074" ea_eleType="element"/>
-				<properties documentation="Revise the Term hierarchy.&#xA;&#xA;e.g. ReviewTerm is per Procedure in SF (to be investigated how it is in eForms). " isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-09-07 15:17:39" modified="2022-09-07 15:18:26" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" xmi:type="uml:Class" name="epo:System" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-03-12 11:51: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="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_5CCFF70B_5C0F_4b3c_8D5E_F1C29EFEBB48" 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"/>
+						<model ea_localid="1830" ea_guid="{5CCFF70B-5C0F-4b3c-8D5E-F1C29EFEBB48}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
 				<links>
-					<NoteLink xmi:id="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" start="EAID_D67F46E0_2B15_4614_A170_F1414A602530" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
-				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2086" 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-10-04 15:39:56" modified="2022-10-04 15:39:56" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" xmi:type="uml:Class" name="foaf:Agent" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-04-24 01:02: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="term"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_B904599A_7FDD_4e84_BE6E_9839EB3B7763" name="dct:title" scope="Public">
+						<initial/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
+						<model ea_localid="1831" ea_guid="{B904599A-7FDD-4e84-BE6E-9839EB3B7763}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_246B4CD5_545D_40e6_BC72_AB7858D869B1" name="epo:hasAlias" scope="Public">
+						<initial/>
+						<documentation value="Acronym or alternative name of the Agent.&#xA;WG Approval 25/03/2021"/>
+						<model ea_localid="1545" ea_guid="{246B4CD5-545D-40e6-BC72-AB7858D869B1}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" 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>
+				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_9512B0DA_565A_4051_A589_525053877046" start="EAID_75629D1B_E406_4b38_82BA_5525819A470C" end="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
+					<Association xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" start="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Generalization xmi:id="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Generalization xmi:id="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" xmi:type="uml:Package" name="participation request term" scope="public">
-				<model package2="EAID_73F19627_5000_4c29_8C5A_E36C25D1B2F6" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="110" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 16:39:49" modified="2022-04-27 12:24:46" 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="term"/>
-				<packageproperties version="1.0"/>
-				<paths/>
-				<times created="2022-01-17 16:39:49" modified="2022-04-27 12:24:46"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
-			</element>
-			<element xmi:idref="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" xmi:type="uml:Package" name="review term" scope="public">
-				<model package2="EAID_769C1965_8BFA_4989_A35B_F3AD33190269" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="118" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-21 09:50:53" modified="2022-04-27 12:24:38" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" xmi:type="uml:Class" name="foaf:Person" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-03-12 11:52: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="term"/>
-				<packageproperties version="1.0"/>
-				<paths/>
-				<times created="2022-01-21 09:50:53" modified="2022-04-27 12:24:38"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<links>
+					<Generalization xmi:id="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Association xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
+					<Generalization xmi:id="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" xmi:type="uml:Package" name="access term" scope="public">
-				<model package2="EAID_3A47255F_6E4B_400c_B002_879945E85F53" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="2" ea_localid="102" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:41:10" modified="2022-04-27 12:24:34" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" xmi:type="uml:Class" name="org:Organization" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" 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="2023-04-24 01:04: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="term"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2022-01-16 15:41:10" modified="2022-04-27 12:24:34"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<attributes>
+					<attribute xmi:idref="EAID_18C4DE72_F4BC_41d4_AC3D_ED76B4DB6031" name="epo:hasLegalName" scope="Public">
+						<initial/>
+						<documentation value="The officially registered name of an organisation. &#xA;&#xA;WG Approval 10/01/2023"/>
+						<model ea_localid="1933" ea_guid="{18C4DE72-F4BC-41d4-AC3D-ED76B4DB6031}"/>
+						<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_007010B6_A8F8_4270_B7F3_A6520D473D5E" name="epo:hasBuyerLegalTypeDescription" scope="Public">
+						<initial/>
+						<documentation value="Self-explanatory text about the Buyer Legal Type.&#xA;&#xA;Additional information:&#xA;This field is used when the Buyer Legal Type is not available in the controlled list at-voc:buyer-legal-type . This is necessary in to cover data provided in the TED Standard Forms. It shall be deprecated in the future. &#xA;&#xA;WG Approval 06/09/2022"/>
+						<model ea_localid="2113" ea_guid="{007010B6-A8F8-4270-B7F3-A6520D473D5E}"/>
+						<properties type="rdf:PlainLiteral" derived="0" 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>
+					<attribute xmi:idref="EAID_37683BEF_44D2_405c_BD81_82AFC900B45E" name="epo:hasLegalFormType" scope="Public">
+						<initial/>
+						<documentation value="The classification of an Organisation according to legislation.&#xA;&#xA;Additional Information:&#xA;Generally, this is defined for Tenderers who want to submit as an Organisation Group.&#xA;Note that the codelist provided at national level should be used.&#xA;"/>
+						<model ea_localid="1694" ea_guid="{37683BEF-44D2-405c-BD81-82AFC900B45E}"/>
+						<properties type="rdf:PlainLiteral" 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>
+					<attribute xmi:idref="EAID_603D2E08_0496_4bc9_88B1_69BC1C7E7EC5" name="epo:hasMainActivityDescription" scope="Public">
+						<initial/>
+						<documentation value="Self-explanatory text about the Main Activity .&#xA;&#xA;Additional information:&#xA;This field is used when the Main Activity is not available in the controlled list at-voc:main-activity-type . This is necessary in to cover data provided in the TED Standard Forms. It shall be deprecated in the future. &#xA;&#xA;WG Approval 06/09/2022&#xA;"/>
+						<model ea_localid="2112" ea_guid="{603D2E08-0496-4bc9-88B1-69BC1C7E7EC5}"/>
+						<properties type="rdf:PlainLiteral" derived="0" 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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_92AEFFF2_FA4D_44f1_804B_58D9571C4D04" name="epo:hasInternetAddress" scope="Public">
+						<initial/>
+						<documentation value="The main web page used by the instance of the concept.&#xA;&#xA;WG Approval 01/06/2023&#xA;"/>
+						<model ea_localid="2147" ea_guid="{92AEFFF2-FA4D-44f1-804B-58D9571C4D04}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="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>
+					<Association xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_15FE118D_5443_4723_8887_BFF48DC77200" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC"/>
+					<Generalization xmi:id="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Dependency xmi:id="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<Association xmi:id="EAID_2FF93267_E672_481d_B370_202D9A0110E0" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
+					<Association xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Dependency xmi:id="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE"/>
+					<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_0AA8BD10_946A_403c_B906_6DB183F74D9F" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_2FF93267_E672_481d_B370_202D9A0110E0" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Association xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" start="EAID_48133D6A_BE44_43c9_A647_04650698EC95" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" xmi:type="uml:Package" name="procedure term" scope="public">
-				<model package2="EAID_094322B0_93A9_4632_B662_C313D87D9F60" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="3" ea_localid="101" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:30:12" modified="2022-04-27 12:24:31" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" tpos="0" ea_localid="2898" ea_eleType="element"/>
+				<properties documentation="based on eForms (BT-124) a Channel may differ per Lot&#xA;based on standard forms, a channel may differ per procedure" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-04-03 18:19:38" modified="2023-04-11 11:42: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="term"/>
-				<packageproperties version="1.0" tpos="3"/>
-				<paths/>
-				<times created="2022-01-16 15:30:12" modified="2022-04-27 12:24:31"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="agent"/>
+				<links>
+					<NoteLink xmi:id="EAID_0DF6152A_D2C0_4f8c_A6A9_A94ADE3ECB16" start="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" xmi:type="uml:Package" name="submission term" scope="public">
-				<model package2="EAID_63D0752E_9535_4d17_A308_BEA4968AC08E" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="3" ea_localid="103" ea_eleType="package"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="4" ea_localid="88" ea_eleType="package"/>
 				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:49:46" modified="2022-04-27 12:24:27" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2021-12-21 12:15:44" modified="2022-04-29 16:46:05" 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="term"/>
-				<packageproperties version="1.0" tpos="3"/>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<packageproperties version="1.0" tpos="4"/>
 				<paths/>
-				<times created="2022-01-16 15:49:46" modified="2022-04-27 12:24:27"/>
+				<times created="2021-12-21 12:15:44" modified="2022-04-29 16:46:05"/>
 				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" xmi:type="uml:Package" name="contract term" scope="public">
-				<model package2="EAID_17292ABC_45DF_4e58_B916_AECA97F87EE9" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="7" ea_localid="105" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 16:06:02" modified="2022-04-27 12:24:24" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" xmi:type="uml:Class" name="epo:AcquiringCentralPurchasingBody" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 11:53:41" 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="term"/>
-				<packageproperties version="1.0" tpos="7"/>
-				<paths/>
-				<times created="2022-01-16 16:06:02" modified="2022-04-27 12:24:24"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" start="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" xmi:type="uml:Package" name="evaluation term" scope="public">
-				<model package2="EAID_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="8" ea_localid="107" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 16:19:14" modified="2022-04-27 12:23:46" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" xmi:type="uml:Class" name="epo:AcquiringParty" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:06:27" 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="term"/>
-				<packageproperties version="1.0" tpos="8"/>
-				<paths/>
-				<times created="2022-01-16 16:19:14" modified="2022-04-27 12:23:46"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" start="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Generalization xmi:id="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" start="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" start="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" start="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" start="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" start="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" start="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" start="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" start="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" start="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" start="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" start="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" start="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" start="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Generalization xmi:id="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" start="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" xmi:type="uml:Class" name="epo:AgentInRole" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:08: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="diagrams"/>
-				<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="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<attributes>
+					<attribute xmi:idref="EAID_73F1D2A1_60CC_4828_8DAB_CC5101B58287" 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"/>
+						<model ea_localid="1769" ea_guid="{73F1D2A1-60CC-4828-8DAB-CC5101B58287}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_89ACE32E_7513_48cd_8763_8038F66E55AF" name="dct:title" scope="Public">
+						<initial/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+						<model ea_localid="1770" ea_guid="{89ACE32E-7513-48cd-8763-8038F66E55AF}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" 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>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					<Association xmi:id="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
+					<Association xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<NoteLink xmi:id="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE" start="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Generalization xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" start="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_670AED44_E69C_416d_988A_2D1D02E4692C" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_67CCA39E_1E30_4142_9536_906052B9AABC" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61" start="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Generalization xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" start="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Generalization xmi:id="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" start="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<Association xmi:id="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" xmi:type="uml:Class" name="epo:AuxiliaryParty" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:08: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="criterion"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Generalization xmi:id="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" start="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" end="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20"/>
+					<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_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_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Generalization xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" start="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Generalization xmi:id="EAID_70DB7081_2834_461e_8B11_0F74ABE52935" start="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Generalization xmi:id="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" start="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Generalization xmi:id="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" start="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<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_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 				</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_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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"/>
+			<element xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" xmi:type="uml:Class" name="epo:Awarder" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="1333" ea_eleType="element"/>
+				<properties documentation="A Role of an Agent that signs the Award Decision." isSpecification="false" 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="2023-03-12 12:08:46" 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="criterion"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Generalization xmi:id="EAID_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27" start="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" end="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20"/>
+					<Generalization xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" start="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<NoteLink xmi:id="EAID_33CADDC4_3A87_4925_A302_795332661BE4" start="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" end="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
 				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" xmi:type="uml:Class" name="epo:AwardingCentralPurchasingBody" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:09: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" start="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" xmi:type="uml:Class" name="epo:BudgetProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:10:33" 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="diagrams"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" start="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78"/>
+				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750" xmi:type="uml:Class" name="epo:Buyer" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-04-24 01:03: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<attributes>
+					<attribute xmi:idref="EAID_B03ACF2B_B2B5_4d67_85D3_9488B22767E2" name="epo:isContractingEntity" scope="Public">
+						<initial/>
+						<documentation value="Role of entities, which:&#xA;&#xA;(a) are contracting authorities or public undertakings and which pursue one of the activities referred to in Articles 8 to 14 of the Directive 2014/25/EU.&#xA;&#xA;(b) when they are not contracting authorities or public undertakings, have as one of their activities any of the activities referred to in Articles 8 to 14, or any combination thereof and operate on the basis of special or exclusive rights granted by a competent authority of a Member State.&#xA;&#xA;Additional Information&#xA;&#xA;The indicator is needed in order to discriminate between those contracts where the Contracting Entity acts as a Contracting Authority undergoing the limits and the rules of Directive 24 and those where it acts as a  Contracting Entity, with certain relaxed constraints.&#xA;For example, the Contracting Entities have different thresholds for the application of Directive 24 if compared with Contracting Authorities.&#xA;&#xA;WG Approval 28/04/2020&#xA;"/>
+						<model ea_localid="1565" ea_guid="{B03ACF2B-B2B5-4d67-85D3-9488B22767E2}"/>
+						<properties type="xsd:boolean" 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_1BE46C8C_217C_4fa5_994D_9A31184F91B4" name="epo:hasActivityDescription" scope="Public">
+						<initial/>
+						<documentation value="In the ePO ontology a taxonomy with all activities, based on different classifications (COFOG, UTILITIES, NACE), will be provided. In ePO this field is to be used exclusively to complement the definition attached to the MainActivityCode.&#xA;&#xA;However, in eForms there is the code &quot;other&quot; to cover undefined activities. For mapping to this eForms feature one could also use this property.&#xA;"/>
+						<model ea_localid="1568" ea_guid="{1BE46C8C-217C-4fa5-994D-9A31184F91B4}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_9E03A190_EF20_4de9_BF47_95E969E738EA" name="epo:hasBuyerProfile" scope="Public">
+						<initial/>
+						<documentation value="Website address where the buyer publishes information on its procurement procedures and general information.&#xA;&#xA;Additional information:&#xA;This corresponds in the eForms to BT-508 Buyer Profile URL.&#xA;&#xA;WG approval 04/05/2018&#xA;"/>
+						<model ea_localid="2030" ea_guid="{9E03A190-EF20-4de9-BF47-95E969E738EA}"/>
+						<properties type="xsd:anyURI" 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>
+					<Association xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<Association xmi:id="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
+					<Association xmi:id="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
+					<Generalization xmi:id="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<Association xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<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_8B8F145A_51EA_4206_A62F_C9887535362E" start="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30" 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_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"/>
+					<Association xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Generalization xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" start="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+				</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_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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"/>
+			<element xmi:idref="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" xmi:type="uml:Class" name="epo:Candidate" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-05-30 16: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="award"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
+					<Generalization xmi:id="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" start="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32"/>
 				</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_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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"/>
+			<element xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" xmi:type="uml:Class" name="epo:CatalogueProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:13: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="award"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Generalization xmi:id="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" start="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" end="EAID_70B4792E_F818_45db_80A4_32F092496FEF"/>
+					<Generalization xmi:id="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" start="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
+					<Association xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
 				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" xmi:type="uml:Class" name="epo:CatalogueReceiver" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:14:27" 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="diagrams"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" start="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
+					<Association xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
+				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
-				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+			<element xmi:idref="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" xmi:type="uml:Class" name="epo:CentralPurchasingBody" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:15:31" 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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="diagrams"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" start="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Generalization xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" start="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+					<Generalization xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" start="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+				</links>
 			</element>
-			<element xmi:idref="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" xmi:type="uml:Package" name="contract" scope="public">
-				<model package2="EAID_94194397_D26C_4972_AE3E_34F5B925DA64" package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="1" ea_localid="139" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-03-29 16:05:23" modified="2023-06-20 11:33:42" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" xmi:type="uml:Class" name="epo:Contractor" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:15: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="document"/>
-				<packageproperties version="1.0" tpos="1"/>
-				<paths/>
-				<times created="2022-03-29 16:05:23" modified="2022-03-29 16:05:23"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<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_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="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" xmi:type="uml:Package" name="review" scope="public">
-				<model package2="EAID_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="2" ea_localid="155" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 10:36:37" modified="2023-06-20 11:33:48" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" xmi:type="uml:Class" name="epo:EmploymentInformationProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:16: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="document"/>
-				<packageproperties version="1.0" tpos="2"/>
-				<paths/>
-				<times created="2022-06-02 10:36:37" modified="2022-06-02 10:36:46"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" start="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" tpos="0" ea_localid="1712" ea_eleType="element"/>
-				<properties documentation="What are the entities that can be reviewed?" isSpecification="false" sType="Note" nType="1" scope="public"/>
-				<project author="lps" version="1.0" phase="1.0" created="2022-04-05 10:20:20" modified="2022-04-05 10:20:47" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" xmi:type="uml:Class" name="epo:EnvironmentalProtectionInformationProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:16: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="review" relatedlinks="idref1=;"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<NoteLink xmi:id="EAID_D16E8CBE_1896_4301_B20D_B5228F72117A" start="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Generalization xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" start="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 				</links>
 			</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="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="2023-07-17 18:18:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" xmi:type="uml:Class" name="epo:JuryMember" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-06-12 16:33: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"/>
-				<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"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
+					<Association xmi:id="EAID_F9D16671_87A9_411b_B205_013259F2908D" start="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30" end="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" xmi:type="uml:Note" scope="public">
-				<model package="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" tpos="0" ea_localid="3061" ea_eleType="element"/>
-				<properties documentation="Added hasAdditionalInformation to cover for section VII.2 in F14, since we do not have the Corrigendum notice type anymore in eForms." isSpecification="false" sType="Note" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-06-14 19:28:20" modified="2023-06-14 19:29:13" complexity="1" status="Proposed"/>
-				<code gentype="&lt;none&gt;"/>
+			<element xmi:idref="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" xmi:type="uml:Class" name="epo:LeadBuyer" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:16: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="notice description"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<NoteLink xmi:id="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A" start="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" end="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC"/>
+					<Generalization xmi:id="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" start="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
 				</links>
 			</element>
-			<element xmi:idref="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" xmi:type="uml:Package" name="classes" scope="public">
-				<model package2="EAID_CCFCD073_1862_4b07_B46D_C4D54A6F3024" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" tpos="14" ea_localid="206" ea_eleType="package"/>
-				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
-				<project author="andreea" version="1.0" phase="1.0" created="2023-07-17 18:17:53" modified="2023-07-17 18:17:53" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" xmi:type="uml:Class" name="epo:Mediator" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:17: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="eProcurementOntology"/>
-				<packageproperties version="1.0" tpos="14"/>
-				<paths/>
-				<times created="2023-07-17 18:17:53" modified="2023-07-17 18:17:53"/>
-				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" start="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_A312F200_1050_451d_97BB_07EBCE11D45C"/>
+				</links>
 			</element>
-			<element xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" xmi:type="uml:Class" name="cccev:Constraint" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" xmi:type="uml:Class" name="epo:OfferingParty" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:18: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"/>
-				<attributes>
-					<attribute xmi:idref="EAID_ED90E511_1F3D_4e84_9D31_63CAC92FD094" name="epo:hasThresholdValue" scope="Public">
-						<initial/>
-						<documentation value="The cut-off level for a given concept.&#xA;&#xA;Additional Information:&#xA;This value is given as e.g. a minimum score, a maximum number of tenders with the highest score passing (see codelist at-voc:number-threshold)."/>
-						<model ea_localid="1775" ea_guid="{ED90E511-1F3D-4e84-9D31-63CAC92FD094}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" 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;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Association xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-					<Dependency xmi:id="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_02014F61_A766_467e_BD3D_7F41689C651B"/>
-					<Generalization xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Association xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+					<Generalization xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" start="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+					<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_5729A98B_A925_4816_AEF4_9EBDE5851B98" start="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" 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"/>
+					<Generalization xmi:id="EAID_8810653B_DB4F_443e_9499_790E7FC8DE86" start="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6" 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_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_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" xmi:type="uml:Class" name="cccev:Criterion" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" xmi:type="uml:Class" name="epo:OfferIssuer" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12: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"/>
-				<attributes>
-					<attribute xmi:idref="EAID_2E954AAA_4A41_46a9_80E7_74981020527C" name="cccev:bias" scope="Public">
-						<initial/>
-						<documentation value="Parameter used to adjust the evaluation of the Criterion.&#xA;&#xA;Additional Information:&#xA;The bias parameter tries to correct a systematic error. For example in procurement, a home bias corresponds to the &quot;presence of local preferences distorting international specialisation and resource allocation&quot;. When quantified, this systematic error can be removed."/>
-						<model ea_localid="2037" ea_guid="{2E954AAA-4A41-46a9-80E7-74981020527C}"/>
-						<properties type="xsd:decimal" 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_676D6F18_AE33_4f71_A555_AC99CF3627D6" name="cccev:weight" scope="Public">
-						<initial/>
-						<documentation value="Relative importance of the Criterion.&#xA;&#xA;Additional Information:&#xA;The weight must be between 0 and 1. Usually, all Criteria can be integrated within a weighted sum equal to 1."/>
-						<model ea_localid="2038" ea_guid="{676D6F18-AE33-4f71-A555-AC99CF3627D6}"/>
-						<properties type="xsd:decimal" 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_4111FA66_AACB_4b42_A23A_1AF9C06417B9" name="cccev:weightingConsiderationDescription" scope="Public">
-						<initial/>
-						<documentation value="Explanation of how the weighting of a Criterion is to be used.&#xA;&#xA;Additional Information:&#xA;This description gives the view of the creator of the Criterion weights on how to interpret and use them during the evaluation process."/>
-						<model ea_localid="2040" ea_guid="{4111FA66-AACB-4b42-A23A-1AF9C06417B9}"/>
-						<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>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Generalization xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Dependency xmi:id="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_31165801_5B33_4e47_B39A_04F149020988"/>
-					<Generalization xmi:id="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
+					<Generalization xmi:id="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" xmi:type="uml:Class" name="cccev:Evidence" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="1966" ea_eleType="element"/>
-				<properties documentation="Proof that a Requirement is met.&#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-07-19 15:16:09" modified="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" xmi:type="uml:Class" name="epo:OfflineAccessProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:19:05" 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"/>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Association xmi:id="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Association xmi:id="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-					<Dependency xmi:id="EAID_A7C105EE_0251_4249_919A_46302D44059E" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE"/>
-					<Generalization xmi:id="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+					<Generalization xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" start="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" xmi:type="uml:Class" name="cccev:InformationConcept" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="1968" ea_eleType="element"/>
-				<properties documentation="Piece of information that the Evidence provides or the Requirement needs." 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" xmi:type="uml:Class" name="epo:OtherEntity" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:19: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_4BC2BB5B_8A97_4bdd_A15E_C716B815CC13" 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"/>
-						<model ea_localid="2101" ea_guid="{4BC2BB5B-8A97-4bdd-A15E-C716B815CC13}"/>
-						<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>
-					<attribute xmi:idref="EAID_EDACC705_499F_489c_AA49_2F4562A747ED" name="skos:prefLabel" scope="Public">
-						<initial/>
-						<documentation value="The preferred lexical label for a resource, in a given language.&#xA;&#xA;WG approval 30/05/2023&#xA;&#xA;"/>
-						<model ea_localid="2102" ea_guid="{EDACC705-499F-489c-AA49-2F4562A747ED}"/>
-						<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="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Association xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C" start="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Generalization xmi:id="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-					<Association xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
-					<Association xmi:id="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Generalization xmi:id="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" start="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" xmi:type="uml:Class" name="cccev:Requirement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" xmi:type="uml:Class" name="epo:ParticipationRequestProcessor" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12: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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_8C66D14F_4A31_454e_9AA2_45BD4C3E92E9" 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"/>
-						<model ea_localid="2046" ea_guid="{8C66D14F-4A31-454e-9AA2-45BD4C3E92E9}"/>
-						<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_76501C03_8E25_4f73_ACD2_B452220092B4" name="skos:prefLabel" scope="Public">
-						<initial/>
-						<documentation value="The preferred lexical label for a resource, in a given language.&#xA;&#xA;WG approval 30/05/2023"/>
-						<model ea_localid="2048" ea_guid="{76501C03-8E25-4f73-ACD2-B452220092B4}"/>
-						<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>
+				<extendedProperties tagged="0" package_name="role"/>
 				<links>
-					<Association xmi:id="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Association xmi:id="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Association xmi:id="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Generalization xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" start="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Generalization xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Generalization xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Generalization xmi:id="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" start="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" xmi:type="uml:Class" name="epo:ParticipationRequestReceiver" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:20: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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" start="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" xmi:type="uml:Class" name="epo:PaymentExecutor" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:20:30" 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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" start="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<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_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" xmi:type="uml:Class" name="epo:ProcurementProcedureInformationProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:20: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" start="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070" xmi:type="uml:Class" name="epo:ProcurementServiceProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:22:44" 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="role"/>
+				<links>
+					<Association xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Generalization xmi:id="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<NoteLink xmi:id="EAID_A5FB826B_2F91_4a40_97ED_A515BDF3B98B" start="EAID_F6DB02CC_2D4E_4a02_B1E9_538EB3E24ED2" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<Association xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" xmi:type="uml:Class" name="epo:Reviewer" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-04-24 01:05: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="role"/>
+				<links>
+					<Dependency xmi:id="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8"/>
+					<Generalization xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" xmi:type="uml:Class" name="epo:ReviewProcedureInformationProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:24: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" start="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" xmi:type="uml:Class" name="epo:ReviewRequester" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:24: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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_7B0A44E0_63E1_4c30_AB83_DA8166C24C14" start="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" xmi:type="uml:Class" name="epo:Subcontractor" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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 well 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="2023-03-12 12:25:40" 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="role"/>
+				<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"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" xmi:type="uml:Class" name="epo:TaxInformationProvider" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:25:53" 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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" start="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" xmi:type="uml:Class" name="epo:Tenderer" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:26:25" 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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
+					<Association xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
+					<Association xmi:id="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" xmi:type="uml:Class" name="epo:TenderProcessor" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:26: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Generalization xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" start="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" xmi:type="uml:Class" name="epo:TenderReceiver" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:26: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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" start="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
+					<Association xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" xmi:type="uml:Class" name="epo:Winner" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-03-12 12:27: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<Association xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
+					<Generalization xmi:id="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Association xmi:id="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
+					<Association xmi:id="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" xmi:type="uml:Class" name="epo:Certifier" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" 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="2023-09-01 16:16:48" 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="role"/>
+				<links>
+					<Generalization xmi:id="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033" start="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Association xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="3088" ea_eleType="element"/>
+				<properties documentation="Here we have roles that belong to other modules (check all).&#xA;Discuss whether we need to move them.&#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-07-12 18:31:40" modified="2023-07-12 18:34: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="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE" start="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2106" ea_eleType="element"/>
+				<properties documentation="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." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-10-31 11:27:31" modified="2022-02-03 17:30:05" 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="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_33CADDC4_3A87_4925_A302_795332661BE4" start="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" end="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2097" 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-10-31 11:27:06" modified="2022-08-25 15:02: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="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463" start="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" end="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2104" ea_eleType="element"/>
+				<properties documentation="Context: &#xA;Issuing invoices, Credit notes&#xA;Could be performed by third parties on behalf of the seller. &#xA;" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:27:08" modified="2022-10-11 15:34: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;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_6B97ADD1_0B83_48d4_9B1E_CDA9640E018F" start="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" end="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2103" ea_eleType="element"/>
+				<properties documentation="Context: Sending of Goods&#xA;e.g. Amazon" isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-10-31 11:27:08" modified="2022-08-25 16:16: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="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B" start="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" end="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="2098" 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-10-31 11:27:06" modified="2022-08-25 15:06: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="role"/>
+				<links>
+					<NoteLink xmi:id="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5" start="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" end="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E"/>
 				</links>
 			</element>
+			<element xmi:idref="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" xmi:type="uml:Package" name="role playing sides" scope="public">
+				<model package2="EAID_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="111" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 22:53:16" modified="2022-04-25 15:25: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="role"/>
+				<packageproperties version="1.0"/>
+				<paths/>
+				<times created="2022-01-17 22:53:16" modified="2022-04-25 15:25:08"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAPK_B6085AA3_C98C_49fa_8FA0_069B51B180A2" xmi:type="uml:Package" name="role predecessor dependecies" scope="public">
+				<model package2="EAID_B6085AA3_C98C_49fa_8FA0_069B51B180A2" package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="0" ea_localid="95" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 13:52:10" modified="2022-04-25 15:25: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="role"/>
+				<packageproperties version="1.0"/>
+				<paths/>
+				<times created="2022-01-16 13:52:10" modified="2022-04-25 15:25:00"/>
+				<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-01-18 11:37: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<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="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" xmi:type="uml:Class" name="cpov:ContactPoint" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="866" ea_eleType="element"/>
+				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" 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="2023-07-17 18:21:04" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2020-02-14 18:42:21" modified="2023-04-24 01:03: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="classes"/>
+				<extendedProperties tagged="0" package_name="location"/>
 				<attributes>
 					<attribute xmi:idref="EAID_CA982154_BE8B_47ed_A7E8_401033A4F00F" name="epo:hasFax" scope="Public">
 						<initial/>
@@ -17381,154 +19182,15 @@
 					<Association xmi:id="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_48133D6A_BE44_43c9_A647_04650698EC95" xmi:type="uml:Class" name="cpov:PublicOrganisation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" start="EAID_48133D6A_BE44_43c9_A647_04650698EC95" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" xmi:type="uml:Class" name="cpv:Person" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_3AAE7D72_B79E_4eb4_80F0_5CA37EE9A9CC" name="foaf:name" scope="Public">
-						<initial/>
-						<documentation value="The complete name of the Person as one string."/>
-						<model ea_localid="1702" ea_guid="{3AAE7D72-B79E-4eb4-80F0-5CA37EE9A9CC}"/>
-						<properties type="rdf:langString" 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="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_2FEA1955_9850_48d7_9727_2F95770EFD98" name="foaf:familyName" scope="Public">
-						<initial/>
-						<documentation value="The hereditary surname of a family.&#xA;"/>
-						<model ea_localid="1703" ea_guid="{2FEA1955-9850-48d7-9727-2F95770EFD98}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_610E9A03_95D6_4189_9498_4B6491677473" name="foaf:givenName" scope="Public">
-						<initial/>
-						<documentation value="The name(s) that identify the Person within a family with a common surname.&#xA;"/>
-						<model ea_localid="1704" ea_guid="{610E9A03-95D6-4189-9498-4B6491677473}"/>
-						<properties type="rdf:langString" derived="0" collection="false" 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_B886263C_9ACE_4eb3_AAA4_B695015AA072" name="person:patronymicName" scope="Public">
-						<initial/>
-						<documentation value="Name based on the given name of the Person's father.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1705" ea_guid="{B886263C-9ACE-4eb3-AAA4-B695015AA072}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="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_C9671A98_14E5_4c22_8CDF_B2A44D33AB17" name="dct:alternative" scope="Public">
-						<initial/>
-						<documentation value="Any name by which an individual is known other than their full name.&#xA;WG 09/11/2021"/>
-						<model ea_localid="1706" ea_guid="{C9671A98-14E5-4c22-8CDF-B2A44D33AB17}"/>
-						<properties type="rdf:langString" 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="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_263C8A1F_B813_473e_B8A5_0B8FD9FC3485" name="person:birthName" scope="Public">
-						<initial/>
-						<documentation value="Family name of the Person given upon their birth.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1707" ea_guid="{263C8A1F-B813-473e-B8A5-0B8FD9FC3485}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="6"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_8CD78B10_2568_474b_B4FD_89DEF282507C" name="cv:birthDate" scope="Public">
-						<initial/>
-						<documentation value="The point in time on which the Person was born."/>
-						<model ea_localid="1708" ea_guid="{8CD78B10-2568-474b-B4FD-89DEF282507C}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-					<Dependency xmi:id="EAID_677B606B_352C_459b_9644_C85CAC550728" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<Dependency xmi:id="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<Association xmi:id="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-					<Generalization xmi:id="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-					<Association xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
-				</links>
-			</element>
 			<element xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" xmi:type="uml:Class" name="cv:Channel" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="2668" ea_eleType="element"/>
+				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" 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="2023-07-17 18:21:04" complexity="1" status="Proposed"/>
+				<project author="lps" version="1.0" phase="1.0" created="2023-02-14 15:22:32" modified="2023-04-11 11:27: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="classes"/>
+				<extendedProperties tagged="0" package_name="location"/>
 				<attributes>
 					<attribute xmi:idref="EAID_7DB1AA63_8792_484d_909C_83FEC34C0F01" name="epo:hasAddressURL" scope="Public">
 						<initial/>
@@ -17571,14 +19233,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" xmi:type="uml:Class" name="dct:Location" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="3072" ea_eleType="element"/>
+				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" 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="2023-07-17 18:21:04" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-26 17:14:19" modified="2023-06-26 18:50:20" 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"/>
+				<extendedProperties tagged="0" package_name="location"/>
 				<attributes>
 					<attribute xmi:idref="EAID_04A92256_22A1_4faf_B623_4983949241CC" name="locn:geographicName" scope="Public">
 						<initial/>
@@ -17612,23 +19274,38 @@
 					<Association xmi:id="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8" start="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" xmi:type="uml:Class" name="epo:AccessTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:28" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68" xmi:type="uml:Class" name="locn:Address" scope="public">
+				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" 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="2023-03-22 12:14:06" 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"/>
+				<extendedProperties tagged="0" package_name="location"/>
 				<attributes>
-					<attribute xmi:idref="EAID_08E88573_F7A6_42d3_8527_025EA7C4ECE9" name="epo:isProcurementDocumentRestricted" scope="Public">
+					<attribute xmi:idref="EAID_03D8D24B_9666_44c8_AE46_FDF98BE48098" name="locn:postName" scope="Public">
 						<initial/>
-						<documentation value="The access to certain procurement documents is restricted.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-14	 Documents Restricted.&#xA;&#xA;WG Approval 10/10/2019"/>
-						<model ea_localid="1517" ea_guid="{08E88573-F7A6-42d3-8527-025EA7C4ECE9}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The key postal division of the address, usually the city. (INSPIRE's definition is &quot;One or more names created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.) For example, &quot;Paris&quot;."/>
+						<model ea_localid="1525" ea_guid="{03D8D24B-9666-44c8-AE46-FDF98BE48098}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="5"/>
+						<stereotype/>
+						<bounds lower="0" upper="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_5D5F6583_5ACA_48be_9C44_DEB260EE3AB7" name="locn:addressArea" scope="Public">
+						<initial/>
+						<documentation value="The name or names of a geographic area or locality that groups a number of addressable objects for addressing purposes, without being an administrative unit.&#xA;&#xA;Additional Information:&#xA;This would typically be part of a city, a neighbourhood or village, e.g. Montmartre."/>
+						<model ea_localid="1982" ea_guid="{5D5F6583-5ACA-48be-9C44-DEB260EE3AB7}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -17637,13 +19314,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_5A7E065B_B472_44ff_97A0_C963A7A5D2CA" name="epo:hasRestrictedAccessURL" scope="Public">
+					<attribute xmi:idref="EAID_70E756E5_00B9_4f66_9D4B_3409713C111D" name="locn:locatorName" scope="Public">
 						<initial/>
-						<documentation value="The internet address with information on accessing the restricted (part of the) procurement document.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-615	 Documents Restricted URL.&#xA;"/>
-						<model ea_localid="2032" ea_guid="{5A7E065B-B472-44ff-97A0-C963A7A5D2CA}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Proper noun(s) applied to the real world entity identified by the locator.&#xA;&#xA;Additional Information:&#xA;The locator name could be the name of the property or complex, of the building or part of the building, or it could be the name of a room inside a building.&#xA;&#xA;The key difference between a locator and a locator name is that the latter is a proper name and is unlikely to include digits. For example, &quot;Shumann, Berlaymont&quot; is a meeting room within the European Commission headquarters for which locator name is more appropriate than locator."/>
+						<model ea_localid="1979" ea_guid="{70E756E5-00B9-4f66-9D4B-3409713C111D}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -17652,13 +19329,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DA554825_D282_4a12_98D4_FC46FC4463B9" name="epo:hasAdditionalInformationDeadline" scope="Public">
+					<attribute xmi:idref="EAID_802D9A52_073D_455b_A0F6_DB8FE24D4365" name="locn:adminUnitL2" scope="Public">
 						<initial/>
-						<documentation value="The time limit for requesting further information.&#xA;&#xA;Additional information:&#xA;&#xA;This is generally used to indicate the deadline for Economic Operators to request further information of the procedure before the submission deadline.&#xA;&#xA;This corresponds in eForms to BT-13 Additional Information Deadline.&#xA;&#xA;WG Approval 09/06/2020&#xA;"/>
-						<model ea_localid="1519" ea_guid="{DA554825-D282-4a12-98D4-FC46FC4463B9}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The name or names of a unit of administration related to the exercise of jurisdictional rights, for local, regional and national governance. Level 2 refers to the region of the address, usually a county, state or other such area that typically encompasses several localities.&#xA;&#xA;Additional Information:&#xA;Some recommended codelists from the EU Publications Office include: Administrative Territorial Units (ATU), NUTS and Local Administrative Units (LAU). The first arrondissement of Paris is for example expressed as &quot;http://publications.europa.eu/resource/authority/atu/FRA_AR_PAR01&quot; in the ATU controlled vocabulary.&#xA;"/>
+						<model ea_localid="2091" ea_guid="{802D9A52-073D-455b-A0F6-DB8FE24D4365}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -17667,13 +19344,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_19C1FCB4_FC45_4f69_A2A2_AC3A9337FFCF" name="epo:hasPublicAccessURL" scope="Public">
+					<attribute xmi:idref="EAID_829CA5E1_0FDA_4c48_8F2E_DB19DABE380D" name="locn:fullAddress" scope="Public">
 						<initial/>
-						<documentation value="Web page where the procurement documents can be downloaded.&#xA;&#xA;Additional Information:&#xA;This corresponds in the eForms to BT-15	    Documents URL.&#xA;&#xA;WG Approval 09/03/2021&#xA;"/>
-						<model ea_localid="2050" ea_guid="{19C1FCB4-FC45-4f69-A2A2-AC3A9337FFCF}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The complete address written as a formatted string.&#xA;&#xA;Additional Information:&#xA;Use of this property is recommended as it will not suffer any misunderstandings that might arise through the breaking up of an address into its component parts. This property is analogous to vCard's label property but with two important differences: (1) formatting is not assumed so that, unlike vCard label, it may not be suitable to print this on an address label, (2) vCard's label property has a domain of vCard Address; the fullAddress property has no such restriction. An example of a full address is &quot;Champ de Mars, 5 Avenue Anatole France, 75007 Paris, France&quot;."/>
+						<model ea_localid="1980" ea_guid="{829CA5E1-0FDA-4c48-8F2E-DB19DABE380D}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -17682,204 +19359,60 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
-					<Generalization xmi:id="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Association xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-					<Association xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E"/>
-					<Association xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A"/>
-					<Generalization xmi:id="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Association xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-					<Association xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-					<Dependency xmi:id="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_1FF5173E_4940_44db_A1A0_C190337F6440"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" xmi:type="uml:Class" name="epo:AcquiringCentralPurchasingBody" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:19: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>
-					<Generalization xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" start="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" xmi:type="uml:Class" name="epo:AcquiringParty" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:19: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>
-					<Generalization xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" start="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Generalization xmi:id="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" start="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_44037F7A_D159_4dd4_8458_E296C8F31B77" start="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" start="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" start="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_800B935D_1C60_427e_9BF3_BDFF0776A54C" start="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" start="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" start="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" start="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_BF3FF147_D995_4e17_B9C6_7721498D7537" start="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" start="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" start="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" start="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" start="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Generalization xmi:id="EAID_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" start="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" xmi:type="uml:Class" name="epo:AdHocChannel" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD" start="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" xmi:type="uml:Class" name="epo:AgentInRole" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_73F1D2A1_60CC_4828_8DAB_CC5101B58287" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_26BA9E10_DECA_4349_A6FE_21031DBF9E64" name="locn:locatorDesignator" 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"/>
-						<model ea_localid="1769" ea_guid="{73F1D2A1-60CC-4828-8DAB-CC5101B58287}"/>
+						<documentation value="A number or a sequence of characters which allows a user or an application to interpret, parse and format the locator within the relevant scope. A locator may include more locator designators.&#xA;&#xA;Additional Information:&#xA;In simpler terms, this is the building number, apartment number, etc. For an address such as &quot;Flat 3, 17 Bridge Street&quot;, the locator is &quot;flat 3, 17&quot;."/>
+						<model ea_localid="1981" ea_guid="{26BA9E10-DECA-4349-A6FE-21031DBF9E64}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_89ACE32E_7513_48cd_8763_8038F66E55AF" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_79C9C8AE_515F_4e62_A7A2_8994B97F40FC" name="locn:adminUnitL1" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
-						<model ea_localid="1770" ea_guid="{89ACE32E-7513-48cd-8763-8038F66E55AF}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The name or names of a unit of administration related to the exercise of jurisdictional rights, for local, regional and national governance. Level 1 refers to the uppermost administrative unit for the address, almost always a country.&#xA;&#xA;Additional Information:&#xA;Best practice is to use the ISO 3166-1 code but if this is inappropriate for the context, country names should be provided in a consistent manner to reduce ambiguity. For example, either write 'France' or 'FRA' consistently throughout the dataset and avoid mixing the two. The Country controlled vocabulary from the Publications Office can be reused for this."/>
+						<model ea_localid="2092" ea_guid="{79C9C8AE-515F-4e62-A7A2-8994B97F40FC}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="8"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Association xmi:id="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-					<Association xmi:id="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-					<Association xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<NoteLink xmi:id="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE" start="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Generalization xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" start="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_670AED44_E69C_416d_988A_2D1D02E4692C" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_67CCA39E_1E30_4142_9536_906052B9AABC" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61" start="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Generalization xmi:id="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" start="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22" start="EAID_17662AEF_1321_446a_AE42_0583F7417A79" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Generalization xmi:id="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B" start="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<Association xmi:id="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" xmi:type="uml:Class" name="epo:AuxiliaryParty" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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="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_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" start="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<Generalization xmi:id="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<Generalization xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" start="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<Generalization xmi:id="EAID_70DB7081_2834_461e_8B11_0F74ABE52935" start="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<Generalization xmi:id="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" start="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<Generalization xmi:id="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" start="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-					<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_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" xmi:type="uml:Class" name="epo:AwardCriteriaSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_30D2C78D_A7B9_4e68_B307_2638D65D637C" start="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" xmi:type="uml:Class" name="epo:AwardCriterion" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_AA86F070_25D3_46df_95DD_5B5DE9E1726B" name="epo:hasAwardCriteriaStatedInProcurementDocuments" scope="Public">
+					<attribute xmi:idref="EAID_BC49BAC4_42EA_469b_B74A_6F71FE025E9D" name="locn:postCode" scope="Public">
 						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="The post/zip code of an address. (INSPIRE's definition is &quot;A code created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.&quot;)&#xA;&#xA;Additional Information:&#xA;Post codes are common elements in many countries' postal address systems. One of the many post codes of Paris is for example &quot;75000&quot;."/>
+						<model ea_localid="1537" ea_guid="{BC49BAC4-42EA-469b-B74A-6F71FE025E9D}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="17"/>
 						<stereotype/>
-						<bounds lower="1" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_4FD10EB5_5FE5_4f22_A0BA_CF6DF5927076" name="epo:hasFixedValue" scope="Public">
+					<attribute xmi:idref="EAID_2AAAB836_ACFF_41ba_AA83_669E38B9DCC0" name="locn:thoroughfare" scope="Public">
 						<initial/>
-						<documentation value="This corresponds in the eForms to BT-541 Award Criterion Number in association with BT-5422	 Award Criterion Number Fixed."/>
-						<model ea_localid="1556" ea_guid="{4FD10EB5-5FE5-4f22-A0BA-CF6DF5927076}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="An address component that represents the name or names of a passage or way through from one location to another. A thoroughfare is not necessarily a road, it might be a waterway or some other feature.&#xA;&#xA;Additional Information:&#xA;For example, &quot;Avenue des Champs-&amp;#201;lys&amp;#233;es&quot;."/>
+						<model ea_localid="1541" ea_guid="{2AAAB836-ACFF-41ba-AA83-669E38B9DCC0}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<containment containment="Not Specified" position="21"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -17888,104 +19421,66 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_E006DB35_535D_4444_B447_89D7A813874C" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Dependency xmi:id="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8"/>
-					<Dependency xmi:id="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" xmi:type="uml:Class" name="epo:Awarder" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="1333" ea_eleType="element"/>
-				<properties documentation="A Role of an Agent that signs the Award Decision." isSpecification="false" 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="2023-07-17 18: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_9506F37E_A7C5_4da0_9F94_6783892A6027" start="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<NoteLink xmi:id="EAID_33CADDC4_3A87_4925_A302_795332661BE4" start="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" end="EAID_B4F30642_373D_4195_B1E6_10198F138ED8"/>
+					<Dependency xmi:id="EAID_626183B8_93AC_4300_B227_85988E5F2016" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40"/>
+					<Association xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<Association xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" start="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Association xmi:id="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" xmi:type="uml:Class" name="epo:AwardEvaluationTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:49" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" xmi:type="uml:Class" name="locn:Geometry" scope="public">
+				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" 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="2023-03-12 12:39:58" 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"/>
+				<extendedProperties tagged="0" package_name="location"/>
 				<attributes>
-					<attribute xmi:idref="EAID_1EC4FBB1_8AE0_4caf_815F_BF4568DEDD87" name="epo:hasAwardCriteriaEvaluationFormula" scope="Public">
+					<attribute xmi:idref="EAID_D017DEC2_D357_4390_80F0_715754917A04" name="cv:coordinates" scope="Public">
 						<initial/>
-						<documentation value="The mathematical equation or any other description used for complicated weighing of criteria (e.g. non-linear weighing, the analytic hierarchy process) when a weighing cannot be expressed per criterion. &#xA;&#xA;Additional Information: &#xA;This corresponds in eForms to BT-543 Award Criteria Complicated."/>
-						<model ea_localid="1634" ea_guid="{1EC4FBB1-8AE0-4caf-815F-BF4568DEDD87}"/>
+						<documentation value="The coordinate list."/>
+						<model ea_localid="1978" ea_guid="{D017DEC2-D357-4390-80F0-715754917A04}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_FED96EAF_5C57_44f2_B2C0_AB86BE0977FB" name="epo:hasOverallQualityAwardCriteriaPonderation" scope="Public">
-						<initial/>
-						<documentation value="The weighting given to quality.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all quality criteria against price or cost criteria."/>
-						<model ea_localid="1635" ea_guid="{FED96EAF-5C57-44f2-B2C0-AB86BE0977FB}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_97A47F40_7ED7_4105_B7B4_75A752F71E30" name="epo:hasOverallPriceAwardCriteriaPonderation" scope="Public">
+					<attribute xmi:idref="EAID_1CE71D53_1214_4337_9DD2_EE0515B85B64" name="cv:longitude" scope="Public">
 						<initial/>
-						<documentation value="The weighting given to price.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all price criteria against cost or quality criteria."/>
-						<model ea_localid="1636" ea_guid="{97A47F40-7ED7-4105-B7B4-75A752F71E30}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The longitude."/>
+						<model ea_localid="1662" ea_guid="{1CE71D53-1214-4337-9DD2-EE0515B85B64}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_8DB5ABA1_A182_4668_9F98_14724C693F16" name="epo:hasAwardCriteriaOrderJustification" scope="Public">
-						<initial/>
-						<documentation value="The justification for only indicating the award criteria's order of importance, not their weighing.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-733 Award Criteria Order Justification."/>
-						<model ea_localid="2033" ea_guid="{8DB5ABA1-A182-4668-9F98-14724C693F16}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_86E77DD5_8E15_49c4_87DC_7C39B5F7A598" name="epo:hasOverallCostAwardCriteriaPonderation" scope="Public">
+					<attribute xmi:idref="EAID_8602AC5B_BF7B_41b5_91EC_CB0218B68ABA" name="cv:latitude" scope="Public">
 						<initial/>
-						<documentation value="The weighting given to cost.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all cost criteria against price or quality criteria."/>
-						<model ea_localid="1637" ea_guid="{86E77DD5-8E15-49c4-87DC-7C39B5F7A598}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The latitude."/>
+						<model ea_localid="1663" ea_guid="{8602AC5B-BF7B-41b5-91EC-CB0218B68ABA}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -17994,105 +19489,104 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" start="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
+					<Association xmi:id="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" xmi:type="uml:Class" name="epo:AwardingCentralPurchasingBody" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:11" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-29 16:46: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" start="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
-				</links>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<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"/>
 			</element>
-			<element xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687" xmi:type="uml:Class" name="epo:AwardOutcome" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" xmi:type="uml:Class" name="epo:ContractSpecificTerm" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" 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="2023-03-12 12:48: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Dependency xmi:id="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0"/>
-					<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_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
-					<Generalization xmi:id="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
-					<Dependency xmi:id="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_D46376EC_6B98_4926_8627_A594E6819D78"/>
-					<Association xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Generalization xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<Association xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<Generalization xmi:id="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<Association xmi:id="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<Generalization xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" start="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Association xmi:id="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Generalization xmi:id="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Generalization xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Association xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" xmi:type="uml:Class" name="epo:BudgetProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:11" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" xmi:type="uml:Class" name="epo:LotSpecificTerm" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" 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="2023-03-12 12:48: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_B513882A_D5F8_4ebc_8C59_831A976F33D2" start="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78"/>
+					<Generalization xmi:id="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" start="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<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_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"/>
+					<Generalization xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" start="EAID_0C735489_15DC_40a7_A94E_A9202738B188" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" start="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_B3295353_448F_433c_921A_A4E96D0B2738" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" xmi:type="uml:Class" name="epo:Business" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" xmi:type="uml:Class" name="epo:ProcedureSpecificTerm" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" 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="2023-03-12 12:48: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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_F71CAE83_7EA2_4c52_90A8_0F254E9E77D7" name="epo:isListedCompany" scope="Public">
-						<initial/>
-						<documentation value="Public companies listed on a stock exchange and subject to disclosure requirements (either by stock exchange&#xA;rules or through law or enforceable means), which impose requirements to ensure adequate transparency of &#xA;beneficial ownership. &#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;&#xA;In eForms this indicator is used when the nationality of beneficial owner is not provided because the Economic Operator is registered in a regulated market that is subject to disclosure requirements consistent with Union law or subject to equivalent international standards which ensure adequate transparency of ownership information. &#xA;&#xA;WG Approval 21/11/2019"/>
-						<model ea_localid="1564" ea_guid="{F71CAE83-7EA2-4c52-90A8-0F254E9E77D7}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="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>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Dependency xmi:id="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E"/>
-					<Association xmi:id="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225"/>
-					<Generalization xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" start="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Association xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<NoteLink xmi:id="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" start="EAID_D67F46E0_2B15_4614_A170_F1414A602530" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750" xmi:type="uml:Class" name="epo:Buyer" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" xmi:type="uml:Class" name="epo:ProcessPlanningTerm" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" 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="2023-03-12 12:48:48" 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"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_B03ACF2B_B2B5_4d67_85D3_9488B22767E2" name="epo:isContractingEntity" scope="Public">
+					<attribute xmi:idref="EAID_F56F0E24_8A13_4665_952E_6B5391B8B3FE" name="epo:hasEstimatedContractNoticePublicationDate" scope="Public">
 						<initial/>
-						<documentation value="Role of entities, which:&#xA;&#xA;(a) are contracting authorities or public undertakings and which pursue one of the activities referred to in Articles 8 to 14 of the Directive 2014/25/EU.&#xA;&#xA;(b) when they are not contracting authorities or public undertakings, have as one of their activities any of the activities referred to in Articles 8 to 14, or any combination thereof and operate on the basis of special or exclusive rights granted by a competent authority of a Member State.&#xA;&#xA;Additional Information&#xA;&#xA;The indicator is needed in order to discriminate between those contracts where the Contracting Entity acts as a Contracting Authority undergoing the limits and the rules of Directive 24 and those where it acts as a  Contracting Entity, with certain relaxed constraints.&#xA;For example, the Contracting Entities have different thresholds for the application of Directive 24 if compared with Contracting Authorities.&#xA;&#xA;WG Approval 28/04/2020&#xA;"/>
-						<model ea_localid="1565" ea_guid="{B03ACF2B-B2B5-4d67-85D3-9488B22767E2}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Foreseen date for publication of Contract Notice.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms BT-127	    Future Notice.&#xA;&#xA;"/>
+						<model ea_localid="1718" ea_guid="{F56F0E24-8A13-4665-952E-6B5391B8B3FE}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -18103,28 +19597,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_1BE46C8C_217C_4fa5_994D_9A31184F91B4" name="epo:hasActivityDescription" scope="Public">
+					<attribute xmi:idref="EAID_738C23D2_C747_4144_9A64_EB3E1F8047A9" name="epo:hasEstimatedTenderInvitationDate" scope="Public">
 						<initial/>
-						<documentation value="In the ePO ontology a taxonomy with all activities, based on different classifications (COFOG, UTILITIES, NACE), will be provided. In ePO this field is to be used exclusively to complement the definition attached to the MainActivityCode.&#xA;&#xA;However, in eForms there is the code &quot;other&quot; to cover undefined activities. For mapping to this eForms feature one could also use this property.&#xA;"/>
-						<model ea_localid="1568" ea_guid="{1BE46C8C-217C-4fa5-994D-9A31184F91B4}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The planned date for the dispatch of the invitations to submit tenders.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1674" ea_guid="{738C23D2-C747-4144-9A64-EB3E1F8047A9}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9E03A190_EF20_4de9_BF47_95E969E738EA" name="epo:hasBuyerProfile" scope="Public">
+					<attribute xmi:idref="EAID_4F1C5F34_17A9_4dcc_ACCD_71AFE4011CBE" name="epo:hasAwardDateScheduled" scope="Public">
 						<initial/>
-						<documentation value="Website address where the buyer publishes information on its procurement procedures and general information.&#xA;&#xA;Additional information:&#xA;This corresponds in the eForms to BT-508 Buyer Profile URL.&#xA;&#xA;WG approval 04/05/2018&#xA;"/>
-						<model ea_localid="2030" ea_guid="{9E03A190-EF20-4de9-BF47-95E969E738EA}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<documentation value="Planned date for the award decision.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1664" ea_guid="{4F1C5F34-17A9-4dcc-ACCD-71AFE4011CBE}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18135,199 +19629,166 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-					<Association xmi:id="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-					<Association xmi:id="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-					<Generalization xmi:id="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
-					<Association xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Association xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<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_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"/>
-					<Association xmi:id="EAID_F1419AFF_EA5D_40db_B89D_FEC52A5F5DBC" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Generalization xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" start="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Association xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" xmi:type="uml:Class" name="epo:Candidate" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_28774B07_2278_44a1_B47E_F671B4F00F63" start="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<Association xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32"/>
+					<Generalization xmi:id="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" start="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" xmi:type="uml:Class" name="epo:CatalogueProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:11" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" xmi:type="uml:Class" name="epo:Term" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" 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="2022-04-25 16:24: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="classes"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_0B89904B_56C2_4154_BC18_F6B8F5B8635B" start="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<Association xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
-					<Association xmi:id="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
+					<Generalization xmi:id="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" start="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" start="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Association xmi:id="EAID_818697AF_821C_40da_B5DE_D7ED82169378" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" start="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" start="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" xmi:type="uml:Class" name="epo:CatalogueReceiver" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:44" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_1B056616_B822_4add_84D3_1D36186827ED" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2084" 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-10-04 15:39:41" modified="2022-10-04 15:39: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="classes"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_DE55F8F3_DEA7_4350_A7EC_23ACD7626ADE" start="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
-					<Association xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
+					<Generalization xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" start="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" end="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" xmi:type="uml:Class" name="epo:CentralPurchasingBody" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:44" 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;"/>
+			<element xmi:idref="EAID_75629D1B_E406_4b38_82BA_5525819A470C" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2085" 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-10-04 15:39:56" modified="2022-10-04 15:39:56" 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"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" start="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Generalization xmi:id="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" start="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
-					<Generalization xmi:id="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" start="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" end="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC"/>
+					<Generalization xmi:id="EAID_9512B0DA_565A_4051_A589_525053877046" start="EAID_75629D1B_E406_4b38_82BA_5525819A470C" end="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" xmi:type="uml:Class" name="epo:ConcessionContract" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:58" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2083" 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-10-04 15:39:41" modified="2022-10-04 15:39: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="classes"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" start="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Generalization xmi:id="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" start="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" end="EAID_1B056616_B822_4add_84D3_1D36186827ED"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" xmi:type="uml:Class" name="epo:ConcessionEstimate" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_D67F46E0_2B15_4614_A170_F1414A602530" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2074" ea_eleType="element"/>
+				<properties documentation="Revise the Term hierarchy.&#xA;&#xA;e.g. ReviewTerm is per Procedure in SF (to be investigated how it is in eForms). " isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-09-07 15:17:39" modified="2022-09-07 15:18:26" 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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_31CB3359_8B8C_4be7_9E3D_A338B0A518EE" name="epo:hasCalculationMethod" scope="Public">
-						<initial/>
-						<documentation value="Formula for obtaining values.&#xA;&#xA;Additional Information:&#xA;The possible values are monetary values, ranking scores, criterion weighting.&#xA;&#xA;WG Approval 25/05/2018"/>
-						<model ea_localid="1849" ea_guid="{31CB3359-8B8C-4be7-9E3D-A338B0A518EE}"/>
-						<properties type="rdf:PlainLiteral" 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>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<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_91D18452_424C_4f36_8E1E_BF993F4D765A" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" 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"/>
-					<Generalization xmi:id="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
-					<Association xmi:id="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
-					<Association xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<NoteLink xmi:id="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" start="EAID_D67F46E0_2B15_4614_A170_F1414A602530" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" xmi:type="uml:Class" name="epo:ContextSpecificDescription" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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 ContextSpecificDescription *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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_818697AF_821C_40da_B5DE_D7ED82169378">
+				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="2086" 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-10-04 15:39:56" modified="2022-10-04 15:39:56" 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"/>
+				<extendedProperties tagged="0" package_name="term"/>
 				<links>
-					<Generalization xmi:id="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73" start="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" start="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" start="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD" start="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_9512B0DA_565A_4051_A589_525053877046" start="EAID_75629D1B_E406_4b38_82BA_5525819A470C" end="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" xmi:type="uml:Class" name="epo:ContextualProjection" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" xmi:type="uml:Package" name="participation request term" scope="public">
+				<model package2="EAID_73F19627_5000_4c29_8C5A_E36C25D1B2F6" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="110" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-17 16:39:49" modified="2022-04-27 12:24:46" 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_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
-					<Generalization xmi:id="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
+				<extendedProperties tagged="0" package_name="term"/>
+				<packageproperties version="1.0"/>
+				<paths/>
+				<times created="2022-01-17 16:39:49" modified="2022-04-27 12:24:46"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" xmi:type="uml:Class" name="epo:ParticipationRequestTerm" scope="public">
+				<model package="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" 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="2023-03-12 12:40:34" 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="participation request term"/>
+				<links>
+					<Association xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788"/>
+					<Generalization xmi:id="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Association xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" xmi:type="uml:Class" name="epo:Contract" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:58" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" xmi:type="uml:Package" name="review term" scope="public">
+				<model package2="EAID_769C1965_8BFA_4989_A35B_F3AD33190269" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="0" ea_localid="118" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-21 09:50:53" modified="2022-04-27 12:24: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="term"/>
+				<packageproperties version="1.0"/>
+				<paths/>
+				<times created="2022-01-21 09:50:53" modified="2022-04-27 12:24:38"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" xmi:type="uml:Class" name="epo:ReviewTerm" scope="public">
+				<model package="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" 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="2023-07-13 06:44: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="classes"/>
+				<extendedProperties tagged="0" package_name="review term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_BC34978E_EE66_4466_B876_2648A2FCB695" name="epo:hasContractConclusionDate" scope="Public">
+					<attribute xmi:idref="EAID_23C008E4_9460_4e04_BCD7_38CCB8AFA518" name="epo:hasReviewProcedure" scope="Public">
 						<initial/>
-						<documentation value="The date the contract was signed by the last signatory party.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;In exceptional cases contracts may be concluded without signature and therefore another date may be used. The date of contract conclusion is always later than the end of any standstill period.&#xA;This concept is not to be confused with the date of completion/end of the contract.&#xA;&#xA;This corresponds in eForms to BT-145	        Contract Conclusion Date.&#xA;&#xA;WG Approval 09/01/2020"/>
-						<model ea_localid="1590" ea_guid="{BC34978E-EE66-4466-B876-2648A2FCB695}"/>
-						<properties type="xsd:date" derived="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="The description of the method used to request the verification that the procedure has been carried out correctly.&#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="2435" ea_guid="{23C008E4-9460-4e04-BCD7-38CCB8AFA518}"/>
+						<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"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_E871E926_FF03_40dc_B883_35A17CF5DA90" name="epo:hasEntryIntoForceDate" scope="Public">
+					<attribute xmi:idref="EAID_BB5F43BE_8210_42d8_9286_649347222247" name="epo:hasReviewDeadline" scope="Public">
 						<initial/>
-						<documentation value="The date on which the contract enters into force.&#xA;&#xA;Additional information: &#xA;&#xA;This is generally the date on which the fulfillment of the contract begins.&#xA;&#xA;This corresponds in eForms to &#xA;&#xA;WG approval 05/11/2019"/>
-						<model ea_localid="1591" ea_guid="{E871E926-FF03-40dc-B883-35A17CF5DA90}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The time limit for review procedures.&#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="2436" ea_guid="{BB5F43BE-8210-42d8-9286-649347222247}"/>
+						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18336,123 +19797,60 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
-					<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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Association xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Association xmi:id="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-					<Association xmi:id="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
-					<Generalization xmi:id="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<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_DDBC2835_CD1A_40df_9C2D_9222DAB14E19" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-					<Association xmi:id="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
-					<Association xmi:id="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
-					<Association xmi:id="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
-					<Association xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Association xmi:id="EAID_1326915C_1564_403a_A96E_65DCEC3F641A" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<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"/>
-					<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"/>
-					<Association xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Generalization xmi:id="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Generalization xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" start="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" xmi:type="uml:Class" name="epo:ContractLotCompletionInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" 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_B32A9E0D_605C_457b_A377_9332E2AA545D" name="epo:hasPaymentValueDiscrepancyJustification" scope="Public">
+					<attribute xmi:idref="EAID_D0AD81EC_4513_4003_8F57_CB232AF26678" name="epo:hasReviewDeadlineInformation" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2407" ea_guid="{B32A9E0D-605C-457b-A377-9332E2AA545D}"/>
+						<documentation value="The description of the time limits for review procedures.&#xA;&#xA;WG Approval 01/10/2019"/>
+						<model ea_localid="2437" ea_guid="{D0AD81EC-4513-4003-8F57-CB232AF26678}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<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_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Generalization xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Association xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
+					<Association xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B"/>
+					<Generalization xmi:id="EAID_B3295353_448F_433c_921A_A4E96D0B2738" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" xmi:type="uml:Class" name="epo:Contractor" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:44" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" xmi:type="uml:Package" name="access term" scope="public">
+				<model package2="EAID_3A47255F_6E4B_400c_B002_879945E85F53" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="2" ea_localid="102" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:41:10" modified="2022-04-27 12:24:34" 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_910BFAB5_C09F_48c2_A281_70A523440BFB" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<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>
+				<extendedProperties tagged="0" package_name="term"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2022-01-16 15:41:10" modified="2022-04-27 12:24:34"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" xmi:type="uml:Class" name="epo:ContractSpecificTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:12" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" xmi:type="uml:Class" name="epo:AccessTerm" scope="public">
+				<model package="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" 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="2023-03-12 12:42: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" start="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Generalization xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Association xmi:id="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Generalization xmi:id="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Generalization xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Association xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" xmi:type="uml:Class" name="epo:ContractTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:44" 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"/>
+				<extendedProperties tagged="0" package_name="access term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_2155C026_DA32_4dad_A471_35D47B85EEA0" name="epo:hasEOrdering" scope="Public">
+					<attribute xmi:idref="EAID_08E88573_F7A6_42d3_8527_025EA7C4ECE9" name="epo:isProcurementDocumentRestricted" scope="Public">
 						<initial/>
-						<documentation value="Electronic means will be used for requesting and purchasing in the post-award process.&#xA;&#xA;WG Approval 12/09/2019&#xA;&#xA;"/>
-						<model ea_localid="1598" ea_guid="{2155C026-DA32-4dad-A471-35D47B85EEA0}"/>
+						<documentation value="The access to certain procurement documents is restricted.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-14	 Documents Restricted.&#xA;&#xA;WG Approval 10/10/2019"/>
+						<model ea_localid="1517" ea_guid="{08E88573-F7A6-42d3-8527-025EA7C4ECE9}"/>
 						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18461,13 +19859,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_7CFD2A96_612A_41e4_9039_862FA1A389EE" name="epo:hasEPayment" scope="Public">
+					<attribute xmi:idref="EAID_5A7E065B_B472_44ff_97A0_C963A7A5D2CA" name="epo:hasRestrictedAccessURL" scope="Public">
 						<initial/>
-						<documentation value="Electronic means must be used for paying.&#xA;WG Approval 09/11/2021&#xA;"/>
-						<model ea_localid="1599" ea_guid="{7CFD2A96-612A-41e4-9039-862FA1A389EE}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The internet address with information on accessing the restricted (part of the) procurement document.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-615	 Documents Restricted URL.&#xA;"/>
+						<model ea_localid="2032" ea_guid="{5A7E065B-B472-44ff-97A0-C963A7A5D2CA}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18476,12 +19874,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C68F69E0_B40A_4fed_BDA5_11FC9CBE7652" name="epo:hasOptions" scope="Public">
+					<attribute xmi:idref="EAID_DA554825_D282_4a12_98D4_FC46FC4463B9" name="epo:hasAdditionalInformationDeadline" scope="Public">
 						<initial/>
-						<documentation value="The buyer reserves the right (not an obligation) for additional purchases from the contractor (while the contract is valid)."/>
-						<model ea_localid="2025" ea_guid="{C68F69E0-B40A-4fed-BDA5-11FC9CBE7652}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
+						<documentation value="The time limit for requesting further information.&#xA;&#xA;Additional information:&#xA;&#xA;This is generally used to indicate the deadline for Economic Operators to request further information of the procedure before the submission deadline.&#xA;&#xA;This corresponds in eForms to BT-13 Additional Information Deadline.&#xA;&#xA;WG Approval 09/06/2020&#xA;"/>
+						<model ea_localid="1519" ea_guid="{DA554825-D282-4a12-98D4-FC46FC4463B9}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -18491,12 +19889,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_B1732554_EAB8_45b5_865A_D1F442CCDE19" name="epo:hasEInvoicing" scope="Public">
+					<attribute xmi:idref="EAID_19C1FCB4_FC45_4f69_A2A2_AC3A9337FFCF" name="epo:hasPublicAccessURL" scope="Public">
 						<initial/>
-						<documentation value="Electronic means will be used for invoicing in the post-award process.&#xA;&#xA;Additional Information:&#xA;This attribute is used for standard form mappings.&#xA;&#xA;WG Approval 12/09/2019&#xA;"/>
-						<model ea_localid="1600" ea_guid="{B1732554-EAB8-45b5-865A-D1F442CCDE19}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="Web page where the procurement documents can be downloaded.&#xA;&#xA;Additional Information:&#xA;This corresponds in the eForms to BT-15	    Documents URL.&#xA;&#xA;WG Approval 09/03/2021&#xA;"/>
+						<model ea_localid="2050" ea_guid="{19C1FCB4-FC45-4f69-A2A2-AC3A9337FFCF}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -18506,13 +19904,36 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_887FE424_9138_46d4_AA7B_A555B7F284A2" name="epo:isRenewalIndicator" scope="Public">
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
+					<Generalization xmi:id="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Association xmi:id="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6"/>
+					<Association xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E"/>
+					<Association xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A"/>
+					<Generalization xmi:id="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Association xmi:id="EAID_D7D6284A_096F_4112_989F_32AD38804C63" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62"/>
+					<Association xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
+					<Dependency xmi:id="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_1FF5173E_4940_44db_A1A0_C190337F6440"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" xmi:type="uml:Class" name="epo:NonDisclosureAgreementTerm" scope="public">
+				<model package="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" 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="2023-06-20 16:45: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="access term"/>
+				<attributes>
+					<attribute xmi:idref="EAID_8F25123B_1103_4f30_A179_7C66AC754CA5" name="dct:description" scope="Public">
 						<initial/>
-						<documentation value="Indicates whether the contract is subject to a renewal clause.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1601" ea_guid="{887FE424-9138-46d4-AA7B-A555B7F284A2}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<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="2428" ea_guid="{8F25123B-1103-4f30-A179-7C66AC754CA5}"/>
+						<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/>
@@ -18521,58 +19942,58 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_CE39B253_B9A9_4b8c_8855_DCE8E0600AF6" name="epo:hasMaximumNumberOfRenewals" scope="Public">
+					<attribute xmi:idref="EAID_3EA015F6_48CD_438f_B329_FEB32481EDA8" name="epo:isNonDisclosureAgreementRequired" scope="Public">
 						<initial/>
-						<documentation value="The maximum number of times the contract can be renewed. &#xA;&#xA;Additional Information&#xA;&#xA;By renewing, the buyer reserves the right (i.e. not an obligation) to renew the contract (i.e. extend its duration) without a new procurement procedure. &#xA;For example, a contract may be valid for one year and the buyer may keep a possibility to renew it (e.g. once, twice) for another three months, if he is content with the services he received.&#xA;&#xA;PLEASE REVIEW THIS DEFINITION AGAIN WITH THE WORKING GROUP. It was originally taken from eForms.&#xA;"/>
-						<model ea_localid="1602" ea_guid="{CE39B253-B9A9-4b8c-8855-DCE8E0600AF6}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="5"/>
+						<documentation/>
+						<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"/>
+						<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_65BB134D_F373_4e7f_8BFE_5AB5D113FDD1" name="epo:hasOptionsDescription" scope="Public">
-						<initial/>
-						<documentation value="The motivation and details about additional purchases that the buyer may undertake while the contract is valid.&#xA;&#xA;WG Approval 09/04/2019 "/>
-						<model ea_localid="1758" ea_guid="{65BB134D-F373-4e7f-8BFE-5AB5D113FDD1}"/>
-						<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;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_FC9100FA_377D_40f9_BFBF_D7305458427F" name="epo:hasRenewalDescription" scope="Public">
+				</attributes>
+				<links>
+					<Generalization xmi:id="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" start="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD" xmi:type="uml:Class" name="epo:OpeningTerm" scope="public">
+				<model package="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" 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="2023-03-12 12:42: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="access term"/>
+				<attributes>
+					<attribute xmi:idref="EAID_811E2A70_F2F3_45c2_BC48_C23FF1B7FF54" name="epo:hasOpeningDateTime" scope="Public">
 						<initial/>
-						<documentation value="Any other information about the renewal(s).&#xA;&#xA;WG approval 16/04/2019 "/>
-						<model ea_localid="1603" ea_guid="{FC9100FA-377D-40f9-BFBF-D7305458427F}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Date and time for the opening of tenders.&#xA;&#xA;WG Approval 12/03/2019&#xA;&#xA;"/>
+						<model ea_localid="1691" ea_guid="{811E2A70-F2F3-45c2-BC48-C23FF1B7FF54}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9ECADED3_74A7_4026_8C22_E64B96F7B965" name="epo:hasPaymentArrangement" scope="Public">
+					<attribute xmi:idref="EAID_49CA1EEA_22FE_48c0_BDCC_9A83EE89165B" name="epo:hasOpeningDescription" scope="Public">
 						<initial/>
-						<documentation value="Information about financial clauses that will govern some economic aspects of the execution of the contract.&#xA;&#xA;Additional Information: These clauses usually refer to financial and payment provisions.&#xA;&#xA;This type of information should be structured instead of a free text in order to reuse it an ideal world. Unfortunately this is an information that in the real life no one is willing to provide pro-actively.&#xA;&#xA;WG Pending of discussion with eForms"/>
-						<model ea_localid="1606" ea_guid="{9ECADED3-74A7-4026-8C22-E64B96F7B965}"/>
+						<documentation value="Further information about the opening of tenders. &#xA;&#xA;Additional Information&#xA;For example, who may participate in the opening and whether any authorization is needed.&#xA;&#xA;WG Approval 12/03/2019"/>
+						<model ea_localid="1692" ea_guid="{49CA1EEA-22FE-48c0-BDCC-9A83EE89165B}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="9"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -18581,13 +20002,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_5B0186A0_76CE_4f7f_81F9_D9B627E4DEA1" name="epo:hasLegalFormRequirement" scope="Public">
+					<attribute xmi:idref="EAID_AC019718_1DBC_43b2_8E36_EC4B49BEF335" name="epo:hasOpeningURL" scope="Public">
 						<initial/>
-						<documentation value="The legal form to be taken by a Contractor.&#xA;&#xA;Additional Information:&#xA;Generally, this is defined to cover the case where an Organisation Group is involved.&#xA;Note that the codelist provided at national level should be used."/>
-						<model ea_localid="2378" ea_guid="{5B0186A0-76CE-4f7f-81F9-D9B627E4DEA1}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The identifier of the address of the Opening of Tenders.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1924" ea_guid="{AC019718-1DBC-43b2-8E36-EC4B49BEF335}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="12"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18596,66 +20017,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9CCDFF8D_9E94_4367_9FC8_D27251DB20AF" name="epo:hasPlaceOfPerformanceAdditionalInformation" scope="Public">
-						<initial/>
-						<documentation value="Further details on the location of the execution of the contract.&#xA;&#xA;WG Approval 30/07/2019"/>
-						<model ea_localid="1609" ea_guid="{9CCDFF8D-9E94-4367-9FC8-D27251DB20AF}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="12"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_F21BEE32_174F_46a9_B3CB_00BE0B239330" name="epo:hasPerformanceConditions" scope="Public">
-						<initial/>
-						<documentation value="The particular conditions and additional information related to the execution of the contract.&#xA;&#xA;Additional Information: &#xA;&#xA;For example, specific information about the place of performance, intermediary deliverables, compensation for damages, intellectual property rights.&#xA;&#xA;WG approval 15-01-2019"/>
-						<model ea_localid="1610" ea_guid="{F21BEE32-174F-46a9-B3CB-00BE0B239330}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="13"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D"/>
-					<Dependency xmi:id="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B"/>
-					<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_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
-					<Dependency xmi:id="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
-					<Dependency xmi:id="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82"/>
-					<Generalization xmi:id="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Dependency xmi:id="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8"/>
-					<Dependency xmi:id="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8"/>
-					<Association xmi:id="EAID_F593B546_502A_413a_8694_914903478877" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
-					<Association xmi:id="EAID_FAA22183_A73E_42a1_854B_9995087470E4" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Generalization xmi:id="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Generalization xmi:id="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Association xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C" xmi:type="uml:Class" name="epo:DesignContestRegimeTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:44" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" xmi:type="uml:Class" name="epo:SecurityClearanceTerm" scope="public">
+				<model package="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" 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="2023-06-20 16:45: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="classes"/>
+				<extendedProperties tagged="0" package_name="access term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_8722EE11_CCB2_4a7b_A2C9_F47802435B26" name="epo:isJuryDecisionBinding" scope="Public">
+					<attribute xmi:idref="EAID_FDA0BF50_CABF_495e_8376_7F059C142FA2" name="epo:hasDeadline" scope="Public">
 						<initial/>
-						<documentation value="Indicates whether the procuring entity is bound to apply the decision of the jury."/>
-						<model ea_localid="1612" ea_guid="{8722EE11-CCB2-4a7b-A2C9-F47802435B26}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The deadline by which the security clearance must be submitted to the buyer.&#xA;&#xA;WG Approval 12/09/2019&#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"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -18666,66 +20049,64 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C435FFA8_C420_46bc_A3DA_63313A6F8C5E" name="epo:hasParticipationPayment" scope="Public">
+					<attribute xmi:idref="EAID_58B626C6_3D05_426d_B057_4FE0D785D8C5" name="dct:description" scope="Public">
 						<initial/>
-						<documentation value="Details on payments to participants &#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1613" ea_guid="{C435FFA8-C420-46bc-A3DA-63313A6F8C5E}"/>
+						<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"/>
+						<model ea_localid="1772" ea_guid="{58B626C6-3D05-426d-B057-4FE0D785D8C5}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8B9A7ADC_F0BE_4958_BE04_24CB02C3E3DC" name="epo:hasFollowupContract" scope="Public">
+					<attribute xmi:idref="EAID_8710D5D2_1B92_4286_8D4C_A392932D7D7E" name="epo:isSecurityClearanceRequired" scope="Public">
 						<initial/>
-						<documentation value="Any subsequent service contract will be awarded to the winner or, in the case of a design contest, winners.&#xA;&#xA;WG Approval 29/08/2019 "/>
-						<model ea_localid="1645" ea_guid="{8B9A7ADC-F0BE-4958-BE04-24CB02C3E3DC}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation/>
+						<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"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_A0BA6EC6_89F9_4090_93D7_77B848BA8488" name="epo:hasFollowupContractInformation" scope="Public">
-						<initial/>
-						<documentation value="Further information about follow-up contracts, prizes and payments (for example non-monetary prizes, payments given for participation).&#xA;&#xA;WG Approval 03/09/2019"/>
-						<model ea_localid="1646" ea_guid="{A0BA6EC6-89F9-4090-93D7-77B848BA8488}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<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_B851F167_3C73_4e45_9F54_76A56333BE1E" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
+					<Generalization xmi:id="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" start="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 				</links>
 			</element>
+			<element xmi:idref="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" xmi:type="uml:Package" name="procedure term" scope="public">
+				<model package2="EAID_094322B0_93A9_4632_B662_C313D87D9F60" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="3" ea_localid="101" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:30:12" modified="2022-04-27 12:24:31" 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="term"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2022-01-16 15:30:12" modified="2022-04-27 12:24:31"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
 			<element xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" xmi:type="uml:Class" name="epo:DirectAwardTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="877" ea_eleType="element"/>
+				<model package="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" 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="2023-07-17 18:21:34" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-03-19 14:59:21" modified="2023-03-12 12:44: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="classes"/>
+				<extendedProperties tagged="0" package_name="procedure term"/>
 				<attributes>
 					<attribute xmi:idref="EAID_D287B0BA_0C10_47cd_8014_0CF056ADDCF4" name="epo:hasJustification" scope="Public">
 						<initial/>
@@ -18750,37 +20131,23 @@
 					<Generalization xmi:id="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" xmi:type="uml:Class" name="epo:DirectContract" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<links>
-					<Association xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-					<Generalization xmi:id="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" xmi:type="uml:Class" name="epo:Document" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:49" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" xmi:type="uml:Class" name="epo:ProcedureTerm" scope="public">
+				<model package="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" 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="2023-03-12 12:44: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="classes"/>
+				<extendedProperties tagged="0" package_name="procedure term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_51F37B13_01DA_4da5_8782_30A2D193D4B4" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_17A91E5D_050A_463f_A57A_8F0E6FEE3D87" name="epo:isSubmissionForAllLotsRequired" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;&#xA;"/>
-						<model ea_localid="2068" ea_guid="{51F37B13-01DA-4da5-8782-30A2D193D4B4}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Indicates whether tenders must be submitted for all Lots.&#xA;"/>
+						<model ea_localid="2107" ea_guid="{17A91E5D-050A-463f-A57A-8F0E6FEE3D87}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18789,28 +20156,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_51725CA6_C5F4_4f21_9EF1_1A912A3B0BB5" name="epo:hasPublicationDate" scope="Public">
+					<attribute xmi:idref="EAID_DF9E5221_DEF8_48d5_8FC1_F33EBDC25F8B" name="epo:hasCrossBorderLaw" scope="Public">
 						<initial/>
-						<documentation value="Date of formal public issuance of the document.&#xA;&#xA;WG approval 20/06/2023"/>
-						<model ea_localid="1685" ea_guid="{51725CA6-C5F4-4f21-9EF1-1A912A3B0BB5}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<documentation value="The applicable law when buyers from different countries procure together within one procurement procedure.&#xA;&#xA;Additional Information: &#xA;This corresponds in eForms to BT-09	    Cross Border Law."/>
+						<model ea_localid="2070" ea_guid="{DF9E5221-DEF8-48d5-8FC1-F33EBDC25F8B}"/>
+						<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"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_3937FE75_CD7A_4066_8A4A_E58D6D3A45F9" name="epo:hasReceptionDate" scope="Public">
+					<attribute xmi:idref="EAID_C4727B61_BCD5_40c3_81A4_ACA3A07B5134" name="epo:isOneLotOnlyAllowed" scope="Public">
 						<initial/>
-						<documentation value="Notes:	Date when a record is acknowledged by an organisation.&#xA;&#xA;WG Approval 12/05/2020"/>
-						<model ea_localid="1617" ea_guid="{3937FE75-CD7A-4066-8A4A-E58D6D3A45F9}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="Indicates whether tenders may be submitted for only one Lot.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 23/08/2022&#xA;&#xA;"/>
+						<model ea_localid="2108" ea_guid="{C4727B61-BCD5-40c3-81A4-ACA3A07B5134}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18819,26 +20186,26 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_61F89B7E_E919_4ed9_8E59_56E7A1D1DF02" name="epo:hasDispatchDate" scope="Public">
+					<attribute xmi:idref="EAID_87748467_D264_48e3_95D6_90F7ABDA229D" name="epo:hasGroupLotEvaluationMethod" scope="Public">
 						<initial/>
-						<documentation value="Date of transmission of a record to an organisation.&#xA;&#xA;WG Approval 12/05/2020"/>
-						<model ea_localid="1618" ea_guid="{61F89B7E-E919-4ed9-8E59-56E7A1D1DF02}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Description of how lots and groups of lots are evaluated against one another in the procedure.&#xA;&#xA;&#xA;&#xA;"/>
+						<model ea_localid="1740" ea_guid="{87748467-D264-48e3-95D6-90F7ABDA229D}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_BDAC9D0C_7361_4b50_A424_99670D546E07" name="dct:issued" scope="Public">
+					<attribute xmi:idref="EAID_30775CBD_01AB_4439_BB83_85D0BD6B04BD" name="epo:isAwardedByCPB" scope="Public">
 						<initial/>
-						<documentation value="Date of formal issuance of the resource.&#xA;&#xA;Additional information: &#xA;This is generally used for modules other than eNotice.&#xA;The xsd:dateTime here means that we can provide either xsd:date, xsd:dateTime, or xsd:timeStamp or any other variant of time expression. This extension needs to be encoded/automated in the ontology and in the application profile. &#xA;Why is it like this? Because UML cannot handle such expressions of disjunctive property ranges.&#xA;&#xA;WG approval 26/01/2023"/>
-						<model ea_localid="2235" ea_guid="{BDAC9D0C-7361-4b50-A424-99670D546E07}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Procedure is awarded by a Central Purchasing Body.&#xA;&#xA;"/>
+						<model ea_localid="2084" ea_guid="{30775CBD-01AB-4439-BB83-85D0BD6B04BD}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
@@ -18849,13 +20216,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_BB755B85_3387_4afc_904E_98634DCB59F5" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_8F0C600A_6541_4744_BB18_D60A02A82939" name="epo:hasMaximumLotSubmissionAllowed" 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="2327" ea_guid="{BB755B85-3387-4afc-904E-98634DCB59F5}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<documentation value="The total number of lots for which one Tenderer can submit Tenders.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 12/12/2018&#xA;&#xA;"/>
+						<model ea_localid="1729" ea_guid="{8F0C600A-6541-4744-BB18-D60A02A82939}"/>
+						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="9"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18864,28 +20231,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_F6220AE8_8F3D_4028_9A5B_A927863C6D72" name="epo:hasAccessURL" scope="Public">
+					<attribute xmi:idref="EAID_D7695A58_E27F_49fd_9845_3793BE63D7B5" name="epo:hasLotAwardCombination" scope="Public">
 						<initial/>
-						<documentation value="Location where the resource can be accessed. &#xA;&#xA;WG approval 07/04/2022"/>
-						<model ea_localid="2028" ea_guid="{F6220AE8-8F3D-4028-9A5B-A927863C6D72}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The contracting authority reserves the right to award contracts combining lots or groups of lots.&#xA;&#xA;Additional Information: &#xA;This property contains information about the Lots concerned. &#xA;This property is required by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 23/08/2022&#xA;"/>
+						<model ea_localid="2109" ea_guid="{D7695A58-E27F-49fd-9845-3793BE63D7B5}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="10"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_94717B46_992B_4a90_B977_87F24DE80620" name="epo:hasVersion" scope="Public">
+					<attribute xmi:idref="EAID_FCA9C00E_214F_4358_9D9A_285895441740" name="epo:hasMaximumNumberOfLotsToBeAwarded" scope="Public">
 						<initial/>
-						<documentation value="A number that identifies a specific state of a document.&#xA;&#xA;WG approval: 18/11/2021&#xA;"/>
-						<model ea_localid="1934" ea_guid="{94717B46-992B-4a90-B977-87F24DE80620}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<documentation value="The maximum number of lots for which contract(s) can be awarded to one tenderer.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG Approval 22/08/2019"/>
+						<model ea_localid="1730" ea_guid="{FCA9C00E-214F-4358-9D9A-285895441740}"/>
+						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="10"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -18894,243 +20261,59 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<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_39F3583F_0D40_4e9f_8018_10297955785C" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
-					<Association xmi:id="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Dependency xmi:id="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
-					<Association xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124"/>
-					<Association xmi:id="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" start="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_39F3583F_0D40_4e9f_8018_10297955785C" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" start="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" start="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" start="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<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_DFE11A54_45B0_449d_B8FF_34E21440DAD9" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" start="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<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_C06EA401_3F55_4448_B4FF_BB7EA510A155" xmi:type="uml:Class" name="epo:DynamicPurchaseSystemTechnique" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Dependency xmi:id="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" xmi:type="uml:Class" name="epo:EAuctionTechnique" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" start="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" xmi:type="uml:Class" name="epo:EconomicStandingSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_35039C01_2836_47b3_898F_14269D31CF88" start="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124" xmi:type="uml:Class" name="epo:ElectronicSignature" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_549AA19E_CB40_4af8_BF5C_1CBDD82A3E31" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_124D7CD7_247B_42a3_AFEB_0FB9003A6A40" name="epo:hasNationalProcedureRules" 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"/>
-						<model ea_localid="2350" ea_guid="{549AA19E-CB40-4af8-BF5C-1CBDD82A3E31}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="11"/>
 						<stereotype/>
-						<bounds lower="1" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" xmi:type="uml:Class" name="epo:EmploymentInformationProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:44" 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_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1" start="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" xmi:type="uml:Class" name="epo:EnvironmentalProtectionInformationProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094" start="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" xmi:type="uml:Class" name="epo:Estimate" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" start="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
-					<Generalization xmi:id="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188" xmi:type="uml:Class" name="epo:EvaluationTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21: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>
-					<Generalization xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" start="EAID_0C735489_15DC_40a7_A94E_A9202738B188" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" start="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
-					<Generalization xmi:id="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" start="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" xmi:type="uml:Class" name="epo:ExclusionGround" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_B158E1D7_3CC5_4e64_8D25_C40F0E038224" start="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
-					<Association xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
+					<Association xmi:id="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_A312F200_1050_451d_97BB_07EBCE11D45C"/>
+					<Association xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+					<Generalization xmi:id="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Association xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78"/>
+					<Association xmi:id="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" xmi:type="uml:Class" name="epo:ExclusionGroundsSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" xmi:type="uml:Package" name="submission term" scope="public">
+				<model package2="EAID_63D0752E_9535_4d17_A308_BEA4968AC08E" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="3" ea_localid="103" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 15:49:46" modified="2022-04-27 12:24: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" start="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" xmi:type="uml:Class" name="epo:ExpressionOfInterest" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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>
-					<Generalization xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" xmi:type="uml:Class" name="epo:FrameworkAgreement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:58" 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_A96B5FDE_85B9_4435_B7E7_D176E6996280" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-					<Generalization xmi:id="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
-				</links>
+				<extendedProperties tagged="0" package_name="term"/>
+				<packageproperties version="1.0" tpos="3"/>
+				<paths/>
+				<times created="2022-01-16 15:49:46" modified="2022-04-27 12:24:27"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
 			</element>
-			<element xmi:idref="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" xmi:type="uml:Class" name="epo:FrameworkAgreementTechnique" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:22" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" xmi:type="uml:Class" name="epo:SubmissionTerm" scope="public">
+				<model package="EAPK_63D0752E_9535_4d17_A308_BEA4968AC08E" 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="2023-03-12 12:45:40" 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_D1D7983F_8387_4c3b_9950_CE4378AD01B0" start="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155" xmi:type="uml:Class" name="epo:FrameworkAgreementTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:44" 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"/>
+				<extendedProperties tagged="0" package_name="submission term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_67939084_F3B6_4ec0_BF8C_0265A6C826AC" name="epo:hasMaximumParticipantsNumber" scope="Public">
+					<attribute xmi:idref="EAID_25B4DC5C_87DD_4edb_867A_D36061C7C85B" name="epo:hasEAuctionURL" scope="Public">
 						<initial/>
-						<documentation value="The maximum number of participants in the framework agreement.&#xA;&#xA;Additional Information:&#xA;Maximum number of tenderers who may be awarded a contract within the framework agreement.&#xA;&#xA;The number is a positive integer.&#xA;&#xA;This corresponds in eForms to BT-113 Framework Maximum Participants Number.&#xA;&#xA;WG Approval 2019-02-05"/>
-						<model ea_localid="2034" ea_guid="{67939084-F3B6-4ec0-BF8C-0265A6C826AC}"/>
-						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The internet address of the electronic auction.&#xA;&#xA;Additional Information:&#xA;&#xA;This corresponds in eForms to BT-123	    Electronic Auction URL."/>
+						<model ea_localid="2052" ea_guid="{25B4DC5C-87DD-4edb-867A-D36061C7C85B}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -19141,28 +20324,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_E690D757_9882_4995_AD97_001D3FCBE1D3" name="epo:hasBuyerCategoryDescription" scope="Public">
-						<initial/>
-						<documentation value="A classification of buyers participating in a framework agreement.&#xA;&#xA;Additional Information:&#xA;Buyers that can use the Framework Agreement not mentioned by name.&#xA;&#xA;For example, the classification &quot;all hospitals in the Tuscany region&quot; is used instead of naming each individual buyer.&#xA;&#xA;This corresponds in eForms to BT-111 Framework Buyer Categories.&#xA;&#xA;WG Approval 2019-05-06"/>
-						<model ea_localid="2036" ea_guid="{E690D757-9882-4995-AD97-001D3FCBE1D3}"/>
-						<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_30C4BAC8_B548_4f26_BC5E_4EB19B6A021A" name="epo:hasDurationExtensionJustification" scope="Public">
+					<attribute xmi:idref="EAID_B8F4E8C3_3C6E_4b8a_9E44_F51D72FE840E" name="epo:hasReceiptDeadline" scope="Public">
 						<initial/>
-						<documentation value="The explanation of the reason why the framework agreement has an extended duration.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-109 Framework Duration Justification.&#xA;The justification for exceptional cases when the duration of the framework agreement exceeds the legal limits. &#xA;&#xA;Four years in the case of the general procurement Directive, seven years in the case of the defence Directive, and eight years in the case of the sectoral Directive.&#xA;&#xA;WG Approval 26/09/2019"/>
-						<model ea_localid="1650" ea_guid="{30C4BAC8-B548-4f26-BC5E-4EB19B6A021A}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The time limit for receiving submissions.&#xA;&#xA;Additional Information&#xA;This is the  deadline by which the buyer must receive submissions (e.g. tenders, requests to participate, clarifications, etc.) and is not the time at which the information is submitted by the economic operator.&#xA;This attribute should be used for standard forms mappings.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
+						<model ea_localid="1816" ea_guid="{B8F4E8C3-3C6E-4b8a-9E44-F51D72FE840E}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -19171,295 +20339,103 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Generalization xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Dependency xmi:id="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_2EEC390D_B44F_4505_8179_765B845FE27F"/>
-					<Association xmi:id="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Generalization xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Generalization xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" xmi:type="uml:Class" name="epo:Fund" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_98A72BB3_DF5F_4be0_AF69_D4FBC1D44760" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_C009AB79_D7C1_4fc1_B974_73482723AB30" name="epo:hasReceiptExpressionDeadline" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
-						<model ea_localid="1653" ea_guid="{98A72BB3-DF5F-4be0-AF69-D4FBC1D44760}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Time limit for receipt of expressions of interest.&#xA;&#xA;Pending of review by the WG&#xA;&#xA;"/>
+						<model ea_localid="1738" ea_guid="{C009AB79-D7C1-4fc1-B974-73482723AB30}"/>
+						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_A8703CC7_1B7A_459a_86B8_A6AD56C43AA1" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_0A093F33_1E8D_431b_B4A7_BC3DD1D88947" name="epo:isGuaranteeRequired" 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"/>
-						<model ea_localid="2061" ea_guid="{A8703CC7-1B7A-459a-86B8-A6AD56C43AA1}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The submitted information must include a financial commitment to be used in case of default.&#xA;&#xA;Additional Information:&#xA;See the additional information provided in  the definition of the 'Guarantee Description' element.&#xA;&#xA;WG Approval 21/07/20&#xA;&#xA;"/>
+						<model ea_localid="1818" ea_guid="{0A093F33-1E8D-431b-B4A7-BC3DD1D88947}"/>
+						<properties type="xsd:boolean" 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="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_1FBFD12B_B5EB_429a_B2C2_846F2F33BCEE" name="epo:hasURL" scope="Public">
+					<attribute xmi:idref="EAID_7FAFE0A0_6346_40b8_8467_BD3EAA918250" name="epo:hasGuaranteeDescription" scope="Public">
 						<initial/>
-						<documentation value="The identifier of a resource.&#xA;&#xA;Additional Information&#xA;&#xA;For example:&#xA;&#xA;1. The URL of the system from where to access the procurement documents;&#xA;2. The URL of the system for the submission of tender documents;&#xA;3. The URL of the system from where to download a tool to communicate with the Buyer;&#xA;4. The URL of the system used by a Technique to allow Economic Operators to exchange information with the Buyer (e.g. eAuction and DPS Systems)&#xA;5. The URL of the system used to exchange information between Buyer and EO for questions and clarifications;&#xA;&#xA;WG Approval 30/09/2019"/>
-						<model ea_localid="1654" ea_guid="{1FBFD12B-B5EB-429a-B2C2-846F2F33BCEE}"/>
-						<properties type="xsd:anyURI" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Information on the financial commitment required from the economic operator. &#xA;&#xA;Additional Information:&#xA;1.  This information may include the amount and the way of delivering of the guarantee&#xA;2. The financial commitment may be retained by the buyer in the case the tenderer withdraws the submitted information (i.e. tender, expression of interest and request for participation, but not request for clarifications) before the award of the contract or does not sign the contract.&#xA;3. Usual modalities are bonds, cheques, loans, other.&#xA;&#xA;WG Approval 21/07/20&#xA;"/>
+						<model ea_localid="1819" ea_guid="{7FAFE0A0-6346-40b8-8467-BD3EAA918250}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5" start="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" end="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C"/>
-					<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_0F625CFF_139F_4712_8BB6_681888ACB178" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-					<Association xmi:id="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" xmi:type="uml:Class" name="epo:GreenProcurement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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;&#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="2023-07-17 18:22: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_DD6655FC_E79A_4249_A596_0EDB3DECCE55" name="epo:usesCleanVehicleDirective" scope="Public">
+					<attribute xmi:idref="EAID_0A0C8C8F_481F_4e16_B636_E9A45391BA3E" name="epo:hasSubmissionURL" scope="Public">
 						<initial/>
-						<documentation value="The procurement falls within the scope of the European Parliament and Council 2009/33/EC (Clean Vehicles Directive – CVD)."/>
-						<model ea_localid="2434" ea_guid="{DD6655FC-E79A-4249-A596-0EDB3DECCE55}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="&#xA;Additional Information:&#xA;This corresponds to the eForms BT-18	    Submission URL.&#xA;&#xA;This corresponds in eForms to BT-509	Organisation eDelivery Gateway."/>
+						<model ea_localid="2051" ea_guid="{0A0C8C8F-481F-4e16-B636-E9A45391BA3E}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728"/>
-					<Dependency xmi:id="EAID_9E45040E_9573_4ec2_971F_0407E27D9413" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3"/>
-					<Generalization xmi:id="EAID_C15E132C_206B_4dd4_976E_204541847F5F" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
-					<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_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" xmi:type="uml:Class" name="epo:InnovativeProcurement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="901" ea_eleType="element"/>
-				<properties documentation="An instance of the class InnovativeProcurement is represented in eForms with the code &quot;inn-pur&quot; defined in the codelist Strategic-Procurement.&#xA;&#xA;Research (21/01/2020):&#xA;&#xA;Purchasing and early adoption of solutions which are not yet available on large scale commercial basis. &#xA;&#xA;Source: Adapted from the Digital Single Market's Policy on Public Procurement of Innovative Solutions. https://ec.europa.eu/digital-single-market/en/public-procurement-innovative-solutions&#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;Question: &#xA;Is  Pre-Commercial Procurement (PCP) another type of Strategic Procurement?" 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="2023-07-17 18:22: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80" start="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
-					<Dependency xmi:id="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549" start="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" end="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" xmi:type="uml:Class" name="epo:JuryMember" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" xmi:type="uml:Class" name="epo:LeadBuyer" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_7B93C4E4_6684_4b82_BE6A_D4FA2FE59843" start="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" xmi:type="uml:Class" name="epo:LotAwardOutcome" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" 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_AEA68A37_2465_4986_9670_843B221BB214" name="epo:hasNonAwardedContractTitle" scope="Public">
+					<attribute xmi:idref="EAID_5940AFF6_EDC8_41c1_A493_F3DF27FB67C5" name="epo:hasNonElectronicSubmissionDescription" scope="Public">
 						<initial/>
-						<documentation value="The title the contract would have had if it had been awarded. &#xA;&#xA;Additional information:&#xA;&#xA;This field is provided to support the data provided in the TED Standard Forms, and it should be discontinued in the future. &#xA;&#xA;WG agreement: 06/09/2022"/>
-						<model ea_localid="2114" ea_guid="{AEA68A37-2465-4986-9670-843B221BB214}"/>
+						<documentation value="Textual explanation of how non-electronic information is to be presented.&#xA;&#xA;WG Approval 21/07/2020&#xA;&#xA;"/>
+						<model ea_localid="1822" ea_guid="{5940AFF6-EDC8-41c1-A493-F3DF27FB67C5}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="8"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_836F6511_2E62_4d10_8AC1_07C24D6A907F" name="epo:hasNonAwardedContractNumber" scope="Public">
+					<attribute xmi:idref="EAID_FE9E9688_0EC4_4a22_8340_EA2FAF94B78F" name="epo:hasReceiptPreliminaryMarketConsultationDeadline" scope="Public">
 						<initial/>
-						<documentation value="The number the contract would have had if it had been awarded. &#xA;&#xA;Additional information:&#xA;&#xA;This field is provided to support the data provided in the TED Standard Forms, and it should be discontinued in the future. &#xA;&#xA;WG agreement: 06/09/2022&#xA;"/>
-						<model ea_localid="2115" ea_guid="{836F6511-2E62-4d10-8AC1-07C24D6A907F}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="10"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" 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_8E718222_A67E_4d16_8978_7B6F899FD855" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" 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_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"/>
-					<Association xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-					<Association xmi:id="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" xmi:type="uml:Class" name="epo:LotGroupAwardInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" 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_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_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"/>
-					<Association xmi:id="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" xmi:type="uml:Class" name="epo:LotSpecificTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" start="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<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_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"/>
-					<Generalization xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" start="EAID_0C735489_15DC_40a7_A94E_A9202738B188" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" start="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_B3295353_448F_433c_921A_A4E96D0B2738" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Generalization xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" xmi:type="uml:Class" name="epo:Mediator" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_2BD2D4BE_B733_42b0_B8FD_2F0BC50DFCA9" start="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_A312F200_1050_451d_97BB_07EBCE11D45C"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" xmi:type="uml:Class" name="epo:MiniCompetitionAwardOutcome" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" 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_0EF2D4DC_7ED0_457c_8310_43761AC8295C" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
-					<Generalization xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<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_3F572668_3AED_4090_BAB3_9047B4874154" xmi:type="uml:Class" name="epo:MultipleStageProcedureTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:44" 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_8ACB5906_2965_4815_8CDE_FB67C01F11E8" name="epo:hasMaximumNumberOfCandidates" scope="Public">
+					<attribute xmi:idref="EAID_DDA42505_C694_419c_B5A3_DCF52C96BA83" name="epo:isAdvancedElectronicSignatureRequired" scope="Public">
 						<initial/>
-						<documentation value="Maximum number of candidates to be invited for the second stage of the procedure.&#xA;&#xA;WG Approval 22/08/2019"/>
-						<model ea_localid="1678" ea_guid="{8ACB5906-2965-4815-8CDE-FB67C01F11E8}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required.&#xA;&#xA;&#xA;&#xA;The submitted information is required to be signed electronically.&#xA;&#xA;Additional Information: &#xA;&#xA;Signature can be defined as &quot;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;For more details on the meaning and uses of electronic signature you may consult different authoritative sources, a relevant one being for instance the Regulation (EU) 910/2014 on electronic identification and trust services for electronic transactions in the internal market.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
+						<model ea_localid="1824" ea_guid="{DDA42505-C694-419c-B5A3-DCF52C96BA83}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="10"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -19468,28 +20444,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_499DE0A3_4E02_4b32_B06D_1C4F4867E9C9" name="epo:hasSuccessiveReduction" scope="Public">
+					<attribute xmi:idref="EAID_B48EEE40_ED5C_48cf_AFC4_3D5FB5EE6906" name="epo:hasReceiptParticipationRequestDeadline" scope="Public">
 						<initial/>
-						<documentation value="The number of solutions or tenders will be reduced in iterative evaluations for multiple staged procedures.&#xA;&#xA;Additional information:&#xA;This refers to multiple-stage procedures (included two-stage procedures, at least). Open Procedures can be seen as one-stage procedures.&#xA;WG Approval 22/08/2019 "/>
-						<model ea_localid="1679" ea_guid="{499DE0A3-4E02-4b32-B06D-1C4F4867E9C9}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="11"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_6EE62EEA_C0BD_4ca6_B28B_7D3AF3196028" name="epo:hasMinimumNumberOfCandidates" scope="Public">
+					<attribute xmi:idref="EAID_80AFF8F1_AF96_4e09_801D_A796A1DC3D1C" name="epo:isMultipleTenderSubmissionAllowed" scope="Public">
 						<initial/>
-						<documentation value="Minimum number of candidates to be invited for the second stage of the procedure.&#xA;&#xA;WG Approval 22/08/2019 "/>
-						<model ea_localid="1680" ea_guid="{6EE62EEA-C0BD-4ca6-B28B-7D3AF3196028}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Tenderers may submit more than one competing tenders.&#xA;&#xA;WG Approval 10/10/2019&#xA;&#xA;"/>
+						<model ea_localid="1825" ea_guid="{80AFF8F1-AF96-4e09-801D-A796A1DC3D1C}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="11"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -19498,89 +20474,84 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_CE3911D1_AED3_4851_B6FA_FC23EED7B627" name="epo:hasEstimatedInvitationToTenderDate" scope="Public">
+					<attribute xmi:idref="EAID_C91BA594_4948_4ee3_BA84_B73B538B8AC5" name="epo:hasReceiptTenderDeadline" scope="Public">
 						<initial/>
-						<documentation value="The estimated date of dispatch of the invitations to submit tenders in two (or more) stage procedures.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-130 Dispatch Invitation Tender.&#xA;&#xA;WG Approval 01/10/2019"/>
-						<model ea_localid="1681" ea_guid="{CE3911D1-AED3-4851-B6FA-FC23EED7B627}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="12"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_72D00562_2765_4156_8A2B_76137A9E6CBF" name="epo:hasNoNegotiationNecessary" scope="Public">
+					<attribute xmi:idref="EAID_64609019_E492_413d_B12C_46646DE65A2D" name="epo:hasLateSubmissionInformationDescription" scope="Public">
 						<initial/>
-						<documentation value="The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.&#xA;&#xA;Additional information:&#xA;See Article 29(4) of Directive 2014/24/EU. &#xA;"/>
-						<model ea_localid="1682" ea_guid="{72D00562-2765-4156-8A2B-76137A9E6CBF}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A narrative text explaining the content of the economic operator information that can be submitted late.&#xA;&#xA;Additional Information&#xA;This does not apply to requests for clarifications.&#xA;"/>
+						<model ea_localid="1828" ea_guid="{64609019-E492-413d-B12C-46646DE65A2D}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="14"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_28A077C1_654A_46a5_B750_B796AB4BF269" name="epo:hasEstimatedInvitationToExpressInterestDate" scope="Public">
-						<initial/>
-						<documentation value="The estimated date of dispatch of the invitations to confirm interest.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-631 Dispatch Invitation Interest."/>
-						<model ea_localid="1683" ea_guid="{28A077C1-654A-46a5-B750-B796AB4BF269}"/>
-						<properties type="xsd:date" 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="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_78F1520E_CC7B_498f_B8C4_29436D9CC375" name="epo:hasQualificationSystemRenewalDescription" scope="Public">
-						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="6"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Association xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Association xmi:id="EAID_1EA9C84A_C46F_456b_A355_DA9CD314CBA0" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
+					<Generalization xmi:id="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Dependency xmi:id="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521"/>
+					<Association xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B"/>
+					<Dependency xmi:id="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1FF5173E_4940_44db_A1A0_C190337F6440"/>
+					<Dependency xmi:id="EAID_8CA66645_D223_487b_B348_21446E4664A6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
+					<Generalization xmi:id="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Dependency xmi:id="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
+					<Association xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2"/>
+					<Dependency xmi:id="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E"/>
+					<Dependency xmi:id="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
+					<Association xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
+					<Dependency xmi:id="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" xmi:type="uml:Class" name="epo:NonDisclosureAgreementTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:28" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" xmi:type="uml:Package" name="contract term" scope="public">
+				<model package2="EAID_17292ABC_45DF_4e58_B916_AECA97F87EE9" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="7" ea_localid="105" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 16:06:02" modified="2022-04-27 12:24:24" 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"/>
+				<extendedProperties tagged="0" package_name="term"/>
+				<packageproperties version="1.0" tpos="7"/>
+				<paths/>
+				<times created="2022-01-16 16:06:02" modified="2022-04-27 12:24:24"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" xmi:type="uml:Class" name="epo:ContractTerm" scope="public">
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2023-03-12 12:46:01" 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="contract term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_8F25123B_1103_4f30_A179_7C66AC754CA5" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_2155C026_DA32_4dad_A471_35D47B85EEA0" name="epo:hasEOrdering" 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="2428" ea_guid="{8F25123B-1103-4f30-A179-7C66AC754CA5}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<documentation value="Electronic means will be used for requesting and purchasing in the post-award process.&#xA;&#xA;WG Approval 12/09/2019&#xA;&#xA;"/>
+						<model ea_localid="1598" ea_guid="{2155C026-DA32-4dad-A471-35D47B85EEA0}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -19589,41 +20560,26 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_3EA015F6_48CD_438f_B329_FEB32481EDA8" name="epo:isNonDisclosureAgreementRequired" scope="Public">
+					<attribute xmi:idref="EAID_7CFD2A96_612A_41e4_9039_862FA1A389EE" name="epo:hasEPayment" scope="Public">
 						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="Electronic means must be used for paying.&#xA;WG Approval 09/11/2021&#xA;"/>
+						<model ea_localid="1599" ea_guid="{7CFD2A96-612A-41e4-9039-862FA1A389EE}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Generalization xmi:id="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" start="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" xmi:type="uml:Class" name="epo:NonPublishedInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:23: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"/>
-				<attributes>
-					<attribute xmi:idref="EAID_1AFEEB35_CA65_4203_912D_52E9A6F5BE28" name="epo:hasAccessibilityDate" scope="Public">
+					<attribute xmi:idref="EAID_C68F69E0_B40A_4fed_BDA5_11FC9CBE7652" name="epo:hasOptions" scope="Public">
 						<initial/>
-						<documentation value="The date at which unpublished data shall be published.&#xA;&#xA;WG Approval 11/06/2020"/>
-						<model ea_localid="1994" ea_guid="{1AFEEB35-CA65-4203-912D-52E9A6F5BE28}"/>
-						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The buyer reserves the right (not an obligation) for additional purchases from the contractor (while the contract is valid)."/>
+						<model ea_localid="2025" ea_guid="{C68F69E0-B40A-4fed-BDA5-11FC9CBE7652}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
@@ -19634,12 +20590,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_3CBF449C_4234_4f51_9B91_AEF3E04AF3F0" name="epo:hasConfidentialityJustification" scope="Public">
+					<attribute xmi:idref="EAID_B1732554_EAB8_45b5_865A_D1F442CCDE19" name="epo:hasEInvoicing" scope="Public">
 						<initial/>
-						<documentation value="A narrative explanation of why data is not published.&#xA;&#xA;Additional Information:&#xA;This element is generally used when the non-publication-justification code chosen is &quot;other&quot;.&#xA;&#xA;WG Approval 09/11/2021&#xA;"/>
-						<model ea_localid="1995" ea_guid="{3CBF449C-4234-4f51-9B91-AEF3E04AF3F0}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
+						<documentation value="Electronic means will be used for invoicing in the post-award process.&#xA;&#xA;Additional Information:&#xA;This attribute is used for standard form mappings.&#xA;&#xA;WG Approval 12/09/2019&#xA;"/>
+						<model ea_localid="1600" ea_guid="{B1732554-EAB8-45b5-865A-D1F442CCDE19}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -19649,138 +20605,120 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<Association xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_632541C4_7CDB_4357_B46D_C59F2C5DFB96" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931"/>
-					<Generalization xmi:id="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" xmi:type="uml:Class" name="epo:Notice" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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"/>
-				<attributes>
-					<attribute xmi:idref="EAID_1264386A_C67E_4009_888E_552A62DE7225" name="epo:hasOJSIssueNumber" scope="Public">
+					<attribute xmi:idref="EAID_887FE424_9138_46d4_AA7B_A555B7F284A2" name="epo:isRenewalIndicator" scope="Public">
 						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="0"/>
+						<documentation value="Indicates whether the contract is subject to a renewal clause.&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1601" ea_guid="{887FE424-9138-46d4-AA7B-A555B7F284A2}"/>
+						<properties type="xsd:boolean" 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;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_2BBC248F_0AEE_4e3f_B002_536AFCD78D28" name="epo:hasOJSType" scope="Public">
+					<attribute xmi:idref="EAID_CE39B253_B9A9_4b8c_8855_DCE8E0600AF6" name="epo:hasMaximumNumberOfRenewals" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2354" ea_guid="{2BBC248F-0AEE-4e3f-B002-536AFCD78D28}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="The maximum number of times the contract can be renewed. &#xA;&#xA;Additional Information&#xA;&#xA;By renewing, the buyer reserves the right (i.e. not an obligation) to renew the contract (i.e. extend its duration) without a new procurement procedure. &#xA;For example, a contract may be valid for one year and the buyer may keep a possibility to renew it (e.g. once, twice) for another three months, if he is content with the services he received.&#xA;&#xA;PLEASE REVIEW THIS DEFINITION AGAIN WITH THE WORKING GROUP. It was originally taken from eForms.&#xA;"/>
+						<model ea_localid="1602" ea_guid="{CE39B253-B9A9-4b8c-8855-DCE8E0600AF6}"/>
+						<properties type="xsd:integer" 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="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_2BFC85C6_8C05_4ca1_87CE_F13FED5DBBB1" name="epo:hasLongTitle" scope="Public">
+					<attribute xmi:idref="EAID_65BB134D_F373_4e7f_8BFE_5AB5D113FDD1" name="epo:hasOptionsDescription" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2355" ea_guid="{2BFC85C6-8C05-4ca1-87CE-F13FED5DBBB1}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="The motivation and details about additional purchases that the buyer may undertake while the contract is valid.&#xA;&#xA;WG Approval 09/04/2019 "/>
+						<model ea_localid="1758" ea_guid="{65BB134D-F373-4e7f-8BFE-5AB5D113FDD1}"/>
+						<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="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_AC36AFF2_4288_4e0c_8944_0179AA352784" name="epo:hasNoticePublicationNumber" scope="Public">
+					<attribute xmi:idref="EAID_FC9100FA_377D_40f9_BFBF_D7305458427F" name="epo:hasRenewalDescription" scope="Public">
 						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="3"/>
+						<documentation value="Any other information about the renewal(s).&#xA;&#xA;WG approval 16/04/2019 "/>
+						<model ea_localid="1603" ea_guid="{FC9100FA-377D-40f9-BFBF-D7305458427F}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<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">
+					<attribute xmi:idref="EAID_9ECADED3_74A7_4026_8C22_E64B96F7B965" name="epo:hasPaymentArrangement" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2357" ea_guid="{41B830AF-AE4D-4902-8134-A119102AB4ED}"/>
-						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<documentation value="Information about financial clauses that will govern some economic aspects of the execution of the contract.&#xA;&#xA;Additional Information: These clauses usually refer to financial and payment provisions.&#xA;&#xA;This type of information should be structured instead of a free text in order to reuse it an ideal world. Unfortunately this is an information that in the real life no one is willing to provide pro-actively.&#xA;&#xA;WG Pending of discussion with eForms"/>
+						<model ea_localid="1606" ea_guid="{9ECADED3-74A7-4026-8C22-E64B96F7B965}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="9"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_D6C37FAA_411E_4ea1_9106_C6437D14FC89" name="epo:hasEFormsSubtype" scope="Public">
+					<attribute xmi:idref="EAID_5B0186A0_76CE_4f7f_81F9_D9B627E4DEA1" name="epo:hasLegalFormRequirement" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2358" ea_guid="{D6C37FAA-411E-4ea1-9106-C6437D14FC89}"/>
-						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The legal form to be taken by a Contractor.&#xA;&#xA;Additional Information:&#xA;Generally, this is defined to cover the case where an Organisation Group is involved.&#xA;Note that the codelist provided at national level should be used."/>
+						<model ea_localid="2378" ea_guid="{5B0186A0-76CE-4f7f-81F9-D9B627E4DEA1}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="5"/>
+						<containment containment="Not Specified" position="12"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_3F661AC2_73BE_4fb2_9DEF_E733091C3271" name="epo:hasAdditionalInformation" scope="Public">
+					<attribute xmi:idref="EAID_9CCDFF8D_9E94_4367_9FC8_D27251DB20AF" name="epo:hasPlaceOfPerformanceAdditionalInformation" scope="Public">
 						<initial/>
-						<documentation value="Supplementary data about the instance of the concept.&#xA;&#xA;WG Approval 15/10/2019"/>
-						<model ea_localid="2403" ea_guid="{3F661AC2-73BE-4fb2-9DEF-E733091C3271}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<documentation value="Further details on the location of the execution of the contract.&#xA;&#xA;WG Approval 30/07/2019"/>
+						<model ea_localid="1609" ea_guid="{9CCDFF8D-9E94-4367-9FC8-D27251DB20AF}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="12"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9517771D_AF11_41cd_BB0D_294796B07624" name="epo:hasESenderDispatchDate" scope="Public">
+					<attribute xmi:idref="EAID_F21BEE32_174F_46a9_B3CB_00BE0B239330" name="epo:hasPerformanceConditions" scope="Public">
 						<initial/>
-						<documentation value="The date and time the notice was transmitted electronically by the eSender to the Publications Office of the European Union.&#xA;&#xA;Additional Information:&#xA;Typically, eSenders include national Official Journals, Buyers sending a large number of electronic Notices, public or private bodies acting on behalf of Buyers and eProcurement software developers.&#xA;&#xA;WG approval 20/06/2023"/>
-						<model ea_localid="2427" ea_guid="{9517771D-AF11-41cd-BB0D-294796B07624}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="8"/>
+						<documentation value="The particular conditions and additional information related to the execution of the contract.&#xA;&#xA;Additional Information: &#xA;&#xA;For example, specific information about the place of performance, intermediary deliverables, compensation for damages, intellectual property rights.&#xA;&#xA;WG approval 15-01-2019"/>
+						<model ea_localid="1610" ea_guid="{F21BEE32-174F-46a9-B3CB-00BE0B239330}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="13"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -19789,99 +20727,66 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Dependency xmi:id="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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"/>
-					<Dependency xmi:id="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282"/>
-					<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_A6577BAD_B1CB_4608_94A0_32241C0F50CE" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Dependency xmi:id="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
-					<Dependency xmi:id="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
-					<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_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"/>
-					<Association xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" xmi:type="uml:Class" name="epo:NoticeAwardInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" 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_079E96B7_4324_4eba_B071_A8B833BDA1EF" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_38F70CB6_EA38_4786_82CF_5486AAD496C1" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
-					<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_59564C5C_30DE_429b_AE68_D4CA3CC6E260" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
-					<Generalization xmi:id="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<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_949017B7_0159_4fe1_8469_562A93DEF12E" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" 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_76074F10_F8BD_4e56_929F_478C3A0B8424" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-					<Association xmi:id="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-					<Association xmi:id="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
-					<Association xmi:id="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+					<Association xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D"/>
+					<Dependency xmi:id="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B"/>
+					<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_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7"/>
+					<Dependency xmi:id="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
+					<Dependency xmi:id="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82"/>
+					<Generalization xmi:id="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Dependency xmi:id="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8"/>
+					<Dependency xmi:id="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8"/>
+					<Association xmi:id="EAID_F593B546_502A_413a_8694_914903478877" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
+					<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_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" xmi:type="uml:Class" name="epo:NoticeChangeInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="1811" ea_eleType="element"/>
-				<properties documentation="Information about a corrigendum in a Notice." 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="2023-07-17 18:23:10" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C" xmi:type="uml:Class" name="epo:DesignContestRegimeTerm" scope="public">
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2022-04-01 16:02:33" 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"/>
+				<extendedProperties tagged="0" package_name="contract term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_BF36FFA5_CE97_49d3_8482_D1EAA764E7D8" name="epo:hasChangeDescription" scope="Public">
+					<attribute xmi:idref="EAID_8722EE11_CCB2_4a7b_A2C9_F47802435B26" name="epo:isJuryDecisionBinding" scope="Public">
 						<initial/>
-						<documentation value="Explanatory text about the instance of the concept.&#xA;&#xA;WG Approval 30/09/2019"/>
-						<model ea_localid="1572" ea_guid="{BF36FFA5-CE97-49d3-8482-D1EAA764E7D8}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Indicates whether the procuring entity is bound to apply the decision of the jury."/>
+						<model ea_localid="1612" ea_guid="{8722EE11-CCB2-4a7b-A2C9-F47802435B26}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_02F1FD10_4A7F_44a3_90AE_DC4CE167531B" name="epo:hasChangeReasonDescription" scope="Public">
+					<attribute xmi:idref="EAID_C435FFA8_C420_46bc_A3DA_63313A6F8C5E" name="epo:hasParticipationPayment" scope="Public">
 						<initial/>
-						<documentation value="Explanatory text about why the element is altered.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms to BT-762 Change Reason Description."/>
-						<model ea_localid="1574" ea_guid="{02F1FD10-4A7F-44a3-90AE-DC4CE167531B}"/>
+						<documentation value="Details on payments to participants &#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1613" ea_guid="{C435FFA8-C420-46bc-A3DA-63313A6F8C5E}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_47233B60_638C_465b_985C_46C4F92E2998" name="epo:isProcurementDocumentChanged" scope="Public">
+					<attribute xmi:idref="EAID_8B9A7ADC_F0BE_4958_BE04_24CB02C3E3DC" name="epo:hasFollowupContract" scope="Public">
 						<initial/>
-						<documentation value="One or more procurement documents have been changed.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-718 Change Procurement Documents&#xA;&#xA;WG Approval 05/11/2019"/>
-						<model ea_localid="1573" ea_guid="{47233B60-638C-465b-985C-46C4F92E2998}"/>
+						<documentation value="Any subsequent service contract will be awarded to the winner or, in the case of a design contest, winners.&#xA;&#xA;WG Approval 29/08/2019 "/>
+						<model ea_localid="1645" ea_guid="{8B9A7ADC-F0BE-4958-BE04-24CB02C3E3DC}"/>
 						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -19890,145 +20795,75 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DD81DA72_316E_4eed_9253_86D09F747DE7" name="epo:hasProcurementDocumentChangeDate" scope="Public">
+					<attribute xmi:idref="EAID_A0BA6EC6_89F9_4090_93D7_77B848BA8488" name="epo:hasFollowupContractInformation" scope="Public">
 						<initial/>
-						<documentation value="The date and time of the change.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-719	 Change Procurement Documents Date&#xA;&#xA;WG Approval 5/11/2019&#xA;"/>
-						<model ea_localid="1576" ea_guid="{DD81DA72-316E-4eed-9253-86D09F747DE7}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Further information about follow-up contracts, prizes and payments (for example non-monetary prizes, payments given for participation).&#xA;&#xA;WG Approval 03/09/2019"/>
+						<model ea_localid="1646" ea_guid="{A0BA6EC6-89F9-4090-93D7-77B848BA8488}"/>
+						<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"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_AE22FB25_6A09_4dd9_A1E2_34E02F94BF9A" name="epo:hasAdditionalInformation" scope="Public">
+					<attribute xmi:idref="EAID_17586F94_9491_4e26_87CA_DC841CBE6FB1" name="epo:hasDescriptionOfPrizes" scope="Public">
 						<initial/>
-						<documentation value="Supplementary data about the instance of the concept.&#xA;&#xA;WG Approval 15/10/2019&#xA;"/>
-						<model ea_localid="2426" ea_guid="{AE22FB25-6A09-4dd9-A1E2-34E02F94BF9A}"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<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_84490705_94B3_445f_ACA6_A903591C3651" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_B2FED202_9ACA_415c_B2AB_A1E3E26E726C" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7"/>
-					<Association xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
-					<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="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" xmi:type="uml:Class" name="epo:Offer" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" start="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" xmi:type="uml:Class" name="epo:OfferingParty" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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>
-					<Generalization xmi:id="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" start="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" end="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6"/>
-					<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_5729A98B_A925_4816_AEF4_9EBDE5851B98" start="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" 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"/>
-					<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_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_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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>
-					<Generalization xmi:id="EAID_A641D156_C668_4cc3_9877_03C8FEE30681" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<Association xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" xmi:type="uml:Class" name="epo:OfflineAccessProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_CD10FCBC_3AD7_437f_AE64_07B876CC0919" start="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A"/>
+					<Generalization xmi:id="EAID_4E161D86_3C31_466f_982A_26607071A85E" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Association xmi:id="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_82AA47D1_6939_4328_8108_0018817C75BD" xmi:type="uml:Class" name="epo:OpeningTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:28" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155" xmi:type="uml:Class" name="epo:FrameworkAgreementTerm" scope="public">
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2023-03-12 12:46:20" 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"/>
+				<extendedProperties tagged="0" package_name="contract term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_811E2A70_F2F3_45c2_BC48_C23FF1B7FF54" name="epo:hasOpeningDateTime" scope="Public">
+					<attribute xmi:idref="EAID_67939084_F3B6_4ec0_BF8C_0265A6C826AC" name="epo:hasMaximumParticipantsNumber" scope="Public">
 						<initial/>
-						<documentation value="Date and time for the opening of tenders.&#xA;&#xA;WG Approval 12/03/2019&#xA;&#xA;"/>
-						<model ea_localid="1691" ea_guid="{811E2A70-F2F3-45c2-BC48-C23FF1B7FF54}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="The maximum number of participants in the framework agreement.&#xA;&#xA;Additional Information:&#xA;Maximum number of tenderers who may be awarded a contract within the framework agreement.&#xA;&#xA;The number is a positive integer.&#xA;&#xA;This corresponds in eForms to BT-113 Framework Maximum Participants Number.&#xA;&#xA;WG Approval 2019-02-05"/>
+						<model ea_localid="2034" ea_guid="{67939084-F3B6-4ec0-BF8C-0265A6C826AC}"/>
+						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_49CA1EEA_22FE_48c0_BDCC_9A83EE89165B" name="epo:hasOpeningDescription" scope="Public">
+					<attribute xmi:idref="EAID_E690D757_9882_4995_AD97_001D3FCBE1D3" name="epo:hasBuyerCategoryDescription" scope="Public">
 						<initial/>
-						<documentation value="Further information about the opening of tenders. &#xA;&#xA;Additional Information&#xA;For example, who may participate in the opening and whether any authorization is needed.&#xA;&#xA;WG Approval 12/03/2019"/>
-						<model ea_localid="1692" ea_guid="{49CA1EEA-22FE-48c0-BDCC-9A83EE89165B}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="A classification of buyers participating in a framework agreement.&#xA;&#xA;Additional Information:&#xA;Buyers that can use the Framework Agreement not mentioned by name.&#xA;&#xA;For example, the classification &quot;all hospitals in the Tuscany region&quot; is used instead of naming each individual buyer.&#xA;&#xA;This corresponds in eForms to BT-111 Framework Buyer Categories.&#xA;&#xA;WG Approval 2019-05-06"/>
+						<model ea_localid="2036" ea_guid="{E690D757-9882-4995-AD97-001D3FCBE1D3}"/>
+						<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/>
@@ -20037,12 +20872,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_AC019718_1DBC_43b2_8E36_EC4B49BEF335" name="epo:hasOpeningURL" scope="Public">
+					<attribute xmi:idref="EAID_30C4BAC8_B548_4f26_BC5E_4EB19B6A021A" name="epo:hasDurationExtensionJustification" scope="Public">
 						<initial/>
-						<documentation value="The identifier of the address of the Opening of Tenders.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1924" ea_guid="{AC019718-1DBC-43b2-8E36-EC4B49BEF335}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
+						<documentation value="The explanation of the reason why the framework agreement has an extended duration.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-109 Framework Duration Justification.&#xA;The justification for exceptional cases when the duration of the framework agreement exceeds the legal limits. &#xA;&#xA;Four years in the case of the general procurement Directive, seven years in the case of the defence Directive, and eight years in the case of the sectoral Directive.&#xA;&#xA;WG Approval 26/09/2019"/>
+						<model ea_localid="1650" ea_guid="{30C4BAC8-B548-4f26-BC5E-4EB19B6A021A}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -20054,115 +20889,119 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Association xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Generalization xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
+					<Dependency xmi:id="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_2EEC390D_B44F_4505_8179_765B845FE27F"/>
+					<Generalization xmi:id="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Generalization xmi:id="EAID_F9E99464_DED7_437a_98F9_263E29761C37" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" xmi:type="uml:Class" name="epo:OrganisationGroup" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_3F572668_3AED_4090_BAB3_9047B4874154" xmi:type="uml:Class" name="epo:MultipleStageProcedureTerm" scope="public">
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2023-03-12 12:47:05" 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"/>
+				<extendedProperties tagged="0" package_name="contract term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_BCE985B9_9499_473a_B5FA_2C4594C6B9A0" name="epo:hasGroupType" scope="Public">
+					<attribute xmi:idref="EAID_8ACB5906_2965_4815_8CDE_FB67C01F11E8" name="epo:hasMaximumNumberOfCandidates" scope="Public">
 						<initial/>
-						<documentation value="Form of collaboration agreement between organisations.&#xA;&#xA;Additional Information:&#xA;This is not a legal type; not to be mistaken with epo:hasLegalFormType which may also be used for Organisation Groups.&#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1925" ea_guid="{BCE985B9-9499-473a-B5FA-2C4594C6B9A0}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
+						<documentation value="Maximum number of candidates to be invited for the second stage of the procedure.&#xA;&#xA;WG Approval 22/08/2019"/>
+						<model ea_localid="1678" ea_guid="{8ACB5906-2965-4815-8CDE-FB67C01F11E8}"/>
+						<properties type="xsd:integer" 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="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Association xmi:id="EAID_0AA8BD10_946A_403c_B906_6DB183F74D9F" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Generalization xmi:id="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Association xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" xmi:type="uml:Class" name="epo:OriginatorRequest" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" start="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A" start="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" end="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" xmi:type="uml:Class" name="epo:OtherEntity" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_5729A98B_A925_4816_AEF4_9EBDE5851B98" start="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" xmi:type="uml:Class" name="epo:ParticipationCondition" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6"/>
-					<Generalization xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" xmi:type="uml:Class" name="epo:ParticipationConditionsSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_5699166A_F9A9_4ed3_8B7D_8A8A4C4E0014" name="epo:describesObjectiveParticipationRules" scope="Public">
+					<attribute xmi:idref="EAID_499DE0A3_4E02_4b32_B06D_1C4F4867E9C9" name="epo:hasSuccessiveReduction" scope="Public">
 						<initial/>
-						<documentation/>
-						<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"/>
+						<documentation value="The number of solutions or tenders will be reduced in iterative evaluations for multiple staged procedures.&#xA;&#xA;Additional information:&#xA;This refers to multiple-stage procedures (included two-stage procedures, at least). Open Procedures can be seen as one-stage procedures.&#xA;WG Approval 22/08/2019 "/>
+						<model ea_localid="1679" ea_guid="{499DE0A3-4E02-4b32-B06D-1C4F4867E9C9}"/>
+						<properties type="xsd:boolean" 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_6EE62EEA_C0BD_4ca6_B28B_7D3AF3196028" name="epo:hasMinimumNumberOfCandidates" scope="Public">
+						<initial/>
+						<documentation value="Minimum number of candidates to be invited for the second stage of the procedure.&#xA;&#xA;WG Approval 22/08/2019 "/>
+						<model ea_localid="1680" ea_guid="{6EE62EEA-C0BD-4ca6-B28B-7D3AF3196028}"/>
+						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<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">
+					<attribute xmi:idref="EAID_CE3911D1_AED3_4851_B6FA_FC23EED7B627" name="epo:hasEstimatedInvitationToTenderDate" scope="Public">
+						<initial/>
+						<documentation value="The estimated date of dispatch of the invitations to submit tenders in two (or more) stage procedures.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-130 Dispatch Invitation Tender.&#xA;&#xA;WG Approval 01/10/2019"/>
+						<model ea_localid="1681" ea_guid="{CE3911D1-AED3-4851-B6FA-FC23EED7B627}"/>
+						<properties type="xsd:date" 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>
+					<attribute xmi:idref="EAID_72D00562_2765_4156_8A2B_76137A9E6CBF" name="epo:hasNoNegotiationNecessary" scope="Public">
+						<initial/>
+						<documentation value="The buyer reserves the right to award the contract on the basis of the initial tenders without any further negotiations.&#xA;&#xA;Additional information:&#xA;See Article 29(4) of Directive 2014/24/EU. &#xA;"/>
+						<model ea_localid="1682" ea_guid="{72D00562-2765-4156-8A2B-76137A9E6CBF}"/>
+						<properties type="xsd:boolean" 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>
+					<attribute xmi:idref="EAID_28A077C1_654A_46a5_B750_B796AB4BF269" name="epo:hasEstimatedInvitationToExpressInterestDate" scope="Public">
+						<initial/>
+						<documentation value="The estimated date of dispatch of the invitations to confirm interest.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-631 Dispatch Invitation Interest."/>
+						<model ea_localid="1683" ea_guid="{28A077C1-654A-46a5-B750-B796AB4BF269}"/>
+						<properties type="xsd:date" 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="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_78F1520E_CC7B_498f_B8C4_29436D9CC375" name="epo:hasQualificationSystemRenewalDescription" scope="Public">
 						<initial/>
 						<documentation/>
-						<model ea_localid="2381" ea_guid="{F79D34B1-CCFA-4297-8DDC-3871A35AD86D}"/>
+						<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"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20173,76 +21012,19 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_0EC24453_1D32_4b47_B797_31C56125A97E" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6"/>
-					<Generalization xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" xmi:type="uml:Class" name="epo:ParticipationRequestProcessor" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20: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_44037F7A_D159_4dd4_8458_E296C8F31B77" start="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" xmi:type="uml:Class" name="epo:ParticipationRequestReceiver" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20: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_F8672A5A_8E49_4ef5_90A5_98580A4DAB3B" start="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" xmi:type="uml:Class" name="epo:ParticipationRequestTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21: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="classes"/>
-				<links>
-					<Association xmi:id="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788"/>
-					<Generalization xmi:id="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Association xmi:id="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" start="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" end="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" xmi:type="uml:Class" name="epo:PaymentExecutor" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:25" 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_800B935D_1C60_427e_9BF3_BDFF0776A54C" start="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D"/>
+					<Generalization xmi:id="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Association xmi:id="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" start="EAID_3F572668_3AED_4090_BAB3_9047B4874154" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
 				</links>
 			</element>
 			<element xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" xmi:type="uml:Class" name="epo:Prize" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="921" ea_eleType="element"/>
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2023-07-17 18:21:44" complexity="1" status="Proposed"/>
+				<project author="jseguraf" version="1.0" phase="1.0" created="2019-08-29 14:54:33" modified="2023-03-12 12:47: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="classes"/>
+				<extendedProperties tagged="0" package_name="contract term"/>
 				<attributes>
 					<attribute xmi:idref="EAID_85ABB9FE_A9D2_43ed_A3E9_06F70F22D65B" name="epo:hasPrizeRank" scope="Public">
 						<initial/>
@@ -20265,58 +21047,23 @@
 					<Association xmi:id="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E" start="EAID_44E7963D_28F5_4263_835A_24C87816F40C" end="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" xmi:type="uml:Class" name="epo:ProcedureSpecificTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" start="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Association xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Generalization xmi:id="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Generalization xmi:id="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<NoteLink xmi:id="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" start="EAID_D67F46E0_2B15_4614_A170_F1414A602530" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Generalization xmi:id="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Generalization xmi:id="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" start="EAID_FA070646_D88B_493f_96AB_8417E2069155" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Generalization xmi:id="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" xmi:type="uml:Class" name="epo:ProcedureTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:34" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" xmi:type="uml:Class" name="epo:SubcontractTerm" scope="public">
+				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" 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="2023-03-12 12:47:31" 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"/>
+				<extendedProperties tagged="0" package_name="contract term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_17A91E5D_050A_463f_A57A_8F0E6FEE3D87" name="epo:isSubmissionForAllLotsAllowed" scope="Public">
-						<initial/>
-						<documentation value="Indicates whether tenders may be submitted for all Lots.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms)&#xA;&#xA;WG approval 23/08/2022&#xA;"/>
-						<model ea_localid="2107" ea_guid="{17A91E5D-050A-463f-A57A-8F0E6FEE3D87}"/>
-						<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;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_DF9E5221_DEF8_48d5_8FC1_F33EBDC25F8B" name="epo:hasCrossBorderLaw" scope="Public">
+					<attribute xmi:idref="EAID_256489E4_B6B6_412c_AD17_AD3730D5DFBA" name="dct:description" scope="Public">
 						<initial/>
-						<documentation value="The applicable law when buyers from different countries procure together within one procurement procedure.&#xA;&#xA;Additional Information: &#xA;This corresponds in eForms to BT-09	    Cross Border Law."/>
-						<model ea_localid="2070" ea_guid="{DF9E5221-DEF8-48d5-8FC1-F33EBDC25F8B}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<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"/>
+						<model ea_localid="1807" ea_guid="{256489E4-B6B6-412c-AD17-AD3730D5DFBA}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -20325,13 +21072,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C4727B61_BCD5_40c3_81A4_ACA3A07B5134" name="epo:isOneLotOnlyAllowed" scope="Public">
+					<attribute xmi:idref="EAID_DE9DB4E1_0EA6_4dca_BE6B_B5F4FE407B6E" name="epo:hasMaximumShare" scope="Public">
 						<initial/>
-						<documentation value="Indicates whether tenders may be submitted for only one Lot.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 23/08/2022&#xA;&#xA;"/>
-						<model ea_localid="2108" ea_guid="{C4727B61-BCD5-40c3-81A4-ACA3A07B5134}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<documentation value="The maximum proportion of something to be distributed.&#xA;&#xA;Additional Information:&#xA;In the case of subcontracting the share may refer to the proportion of works, services or supplies being subcontracted.&#xA;&#xA;WG Approval 17/09/2019 &#xA;&#xA;"/>
+						<model ea_localid="1808" ea_guid="{DE9DB4E1-0EA6-4dca-BE6B-B5F4FE407B6E}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20340,28 +21087,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_87748467_D264_48e3_95D6_90F7ABDA229D" name="epo:hasGroupLotEvaluationMethod" scope="Public">
+					<attribute xmi:idref="EAID_A8247705_906D_4a85_A700_40F3E3506692" name="epo:hasMinimumShare" scope="Public">
 						<initial/>
-						<documentation value="Description of how lots and groups of lots are evaluated against one another in the procedure.&#xA;&#xA;&#xA;&#xA;"/>
-						<model ea_localid="1740" ea_guid="{87748467-D264-48e3-95D6-90F7ABDA229D}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The minimum proportion of something to be distributed.&#xA;&#xA;Additional Information:&#xA;In the case of subcontracting the share may refer to the proportion of works, services or supplies being subcontracted.&#xA;&#xA;WG Approval 17/09/2019"/>
+						<model ea_localid="1809" ea_guid="{A8247705-906D-4a85-A700-40F3E3506692}"/>
+						<properties type="xsd:decimal" 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>
-					<attribute xmi:idref="EAID_30775CBD_01AB_4439_BB83_85D0BD6B04BD" name="epo:isAwardedByCPB" scope="Public">
-						<initial/>
-						<documentation value="Procedure is awarded by a Central Purchasing Body.&#xA;&#xA;"/>
-						<model ea_localid="2084" ea_guid="{30775CBD-01AB-4439-BB83-85D0BD6B04BD}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="5"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20370,13 +21102,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8F0C600A_6541_4744_BB18_D60A02A82939" name="epo:hasMaximumLotSubmissionAllowed" scope="Public">
+					<attribute xmi:idref="EAID_999AAF46_5E6C_43b3_ACEB_B3E3DEF42F46" name="epo:hasSubcontractingInvolved" scope="Public">
 						<initial/>
-						<documentation value="The total number of lots for which one Tenderer can submit Tenders.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 12/12/2018&#xA;&#xA;"/>
-						<model ea_localid="1729" ea_guid="{8F0C600A-6541-4744-BB18-D60A02A82939}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="List of Subcontractors and the subject matter they cover are required.&#xA;&#xA;Additional Information: &#xA;The tenderer will ned to supply this information in the tender.&#xA;&#xA;WG Approval 28/02/2019"/>
+						<model ea_localid="1810" ea_guid="{999AAF46-5E6C-43b3-ACEB-B3E3DEF42F46}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="9"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20385,13 +21117,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_D7695A58_E27F_49fd_9845_3793BE63D7B5" name="epo:hasLotAwardCombination" scope="Public">
+					<attribute xmi:idref="EAID_E4C9B9DC_BAAD_40d2_B56F_21B5FDF8C067" name="epo:hasMinimumSubcontractorsProposedObligation" scope="Public">
 						<initial/>
-						<documentation value="The contracting authority reserves the right to award contracts combining lots or groups of lots.&#xA;&#xA;Additional Information: &#xA;This property contains information about the Lots concerned. &#xA;This property is required by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG approval 23/08/2022&#xA;"/>
-						<model ea_localid="2109" ea_guid="{D7695A58-E27F-49fd-9845-3793BE63D7B5}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="10"/>
+						<documentation value="The minimum percentage of the contract value that the contractor must subcontract.&#xA;&#xA;Additional information:&#xA;This is used for the competitive procedure described in Title III of Directive 2009/81/EC. &#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1812" ea_guid="{E4C9B9DC-BAAD-40d2-B56F-21B5FDF8C067}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20400,13 +21132,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_FCA9C00E_214F_4358_9D9A_285895441740" name="epo:hasMaximumNumberOfLotsToBeAwarded" scope="Public">
+					<attribute xmi:idref="EAID_CB6A57C6_ED53_40e1_806D_C89FF9D2DCC9" name="epo:hasSubcontractorsProposedAboveObligation" scope="Public">
 						<initial/>
-						<documentation value="The maximum number of lots for which contract(s) can be awarded to one tenderer.&#xA;&#xA;Additional information:&#xA;This field is used to complement the SubmissionTerms (which are at the Lot level) for the Procedure level which is covered by the regulation (EU)-2015-1986 (modeled in the TED Standard Forms).&#xA;&#xA;WG Approval 22/08/2019"/>
-						<model ea_localid="1730" ea_guid="{FCA9C00E-214F-4358-9D9A-285895441740}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The maximum percentage of the contract value that the contractor must subcontract.&#xA;&#xA;Additional information:&#xA;This is used for the competitive procedure described in Title III of Directive 2009/81/EC. &#xA;&#xA;WG Approval 09/11/2021"/>
+						<model ea_localid="1814" ea_guid="{CB6A57C6-ED53-40e1-806D-C89FF9D2DCC9}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="10"/>
+						<containment containment="Not Specified" position="8"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20415,62 +21147,59 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_124D7CD7_247B_42a3_AFEB_0FB9003A6A40" name="epo:hasNationalProcedureRules" scope="Public">
-						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="11"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_A312F200_1050_451d_97BB_07EBCE11D45C"/>
-					<Association xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-					<Generalization xmi:id="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Association xmi:id="EAID_869B2877_CC4F_472f_9ED2_7DCA708FAEF8" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78"/>
-					<Association xmi:id="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
+					<Generalization xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Dependency xmi:id="EAID_C8DDF2AD_D50E_4225_A715_E7C9368CEB39" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011"/>
+					<Association xmi:id="EAID_F593B546_502A_413a_8694_914903478877" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" xmi:type="uml:Class" name="epo:ProcessPlanningTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:12" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" xmi:type="uml:Package" name="evaluation term" scope="public">
+				<model package2="EAID_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="8" ea_localid="107" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-01-16 16:19:14" modified="2022-04-27 12:23:46" 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="term"/>
+				<packageproperties version="1.0" tpos="8"/>
+				<paths/>
+				<times created="2022-01-16 16:19:14" modified="2022-04-27 12:23:46"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" xmi:type="uml:Class" name="epo:AwardEvaluationTerm" scope="public">
+				<model package="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" 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="2023-03-12 12:47:47" 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"/>
+				<extendedProperties tagged="0" package_name="evaluation term"/>
 				<attributes>
-					<attribute xmi:idref="EAID_F56F0E24_8A13_4665_952E_6B5391B8B3FE" name="epo:hasEstimatedContractNoticePublicationDate" scope="Public">
+					<attribute xmi:idref="EAID_1EC4FBB1_8AE0_4caf_815F_BF4568DEDD87" name="epo:hasAwardCriteriaEvaluationFormula" scope="Public">
 						<initial/>
-						<documentation value="Foreseen date for publication of Contract Notice.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms BT-127	    Future Notice.&#xA;&#xA;"/>
-						<model ea_localid="1718" ea_guid="{F56F0E24-8A13-4665-952E-6B5391B8B3FE}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The mathematical equation or any other description used for complicated weighing of criteria (e.g. non-linear weighing, the analytic hierarchy process) when a weighing cannot be expressed per criterion. &#xA;&#xA;Additional Information: &#xA;This corresponds in eForms to BT-543 Award Criteria Complicated."/>
+						<model ea_localid="1634" ea_guid="{1EC4FBB1-8AE0-4caf-815F-BF4568DEDD87}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_738C23D2_C747_4144_9A64_EB3E1F8047A9" name="epo:hasEstimatedTenderInvitationDate" scope="Public">
+					<attribute xmi:idref="EAID_FED96EAF_5C57_44f2_B2C0_AB86BE0977FB" name="epo:hasOverallQualityAwardCriteriaPonderation" scope="Public">
 						<initial/>
-						<documentation value="The planned date for the dispatch of the invitations to submit tenders.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1674" ea_guid="{738C23D2-C747-4144-9A64-EB3E1F8047A9}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The weighting given to quality.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all quality criteria against price or cost criteria."/>
+						<model ea_localid="1635" ea_guid="{FED96EAF-5C57-44f2-B2C0-AB86BE0977FB}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20479,13 +21208,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_4F1C5F34_17A9_4dcc_ACCD_71AFE4011CBE" name="epo:hasAwardDateScheduled" scope="Public">
+					<attribute xmi:idref="EAID_97A47F40_7ED7_4105_B7B4_75A752F71E30" name="epo:hasOverallPriceAwardCriteriaPonderation" scope="Public">
 						<initial/>
-						<documentation value="Planned date for the award decision.&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1664" ea_guid="{4F1C5F34-17A9-4dcc-ACCD-71AFE4011CBE}"/>
-						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The weighting given to price.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all price criteria against cost or quality criteria."/>
+						<model ea_localid="1636" ea_guid="{97A47F40-7ED7-4105-B7B4-75A752F71E30}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20494,62 +21223,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Generalization xmi:id="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" start="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" xmi:type="uml:Class" name="epo:ProcurementCriteriaSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_41E8D101_053A_4b0b_93CE_CA1C3787B4A3" name="epo:indicatesPerformingStaffInformationRequirement" scope="Public">
+					<attribute xmi:idref="EAID_8DB5ABA1_A182_4668_9F98_14724C693F16" name="epo:hasAwardCriteriaOrderJustification" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2241" ea_guid="{41E8D101-053A-4b0b-93CE-CA1C3787B4A3}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The justification for only indicating the award criteria's order of importance, not their weighing.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-733 Award Criteria Order Justification."/>
+						<model ea_localid="2033" ea_guid="{8DB5ABA1-A182-4668-9F98-14724C693F16}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Generalization xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" start="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
-					<Generalization xmi:id="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" start="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-					<Generalization xmi:id="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD" start="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-					<Association xmi:id="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-					<Generalization xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" xmi:type="uml:Class" name="epo:ProcurementCriterion" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_53D15EA1_B17A_48ea_983D_0A065FE34A6C" name="epo:hasFormula" scope="Public">
+					<attribute xmi:idref="EAID_86E77DD5_8E15_49c4_87DC_7C39B5F7A598" name="epo:hasOverallCostAwardCriteriaPonderation" scope="Public">
 						<initial/>
-						<documentation value="The mathematical equation or any other description used for complicated weighing of criteria (e.g. non-linear weighing, the analytic hierarchy process) when a weighing cannot be expressed per criterion. &#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-543."/>
-						<model ea_localid="1781" ea_guid="{53D15EA1-B17A-48ea-983D-0A065FE34A6C}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The weighting given to cost.&#xA;&#xA;Additional Information:&#xA;This weighting covers usually all cost criteria against price or quality criteria."/>
+						<model ea_localid="1637" ea_guid="{86E77DD5-8E15-49c4-87DC-7C39B5F7A598}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20560,60 +21255,99 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_277C636A_D943_484f_A80D_69ACBFA6147C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006"/>
-					<Dependency xmi:id="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58"/>
-					<Generalization xmi:id="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
-					<Association xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
-					<Generalization xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" start="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Association xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Generalization xmi:id="EAID_E006DB35_535D_4444_B447_89D7A813874C" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Generalization xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Association xmi:id="EAID_FC7073E1_3362_472f_B087_27A619B6C819" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Generalization xmi:id="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" start="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" xmi:type="uml:Class" name="epo:ProcurementDocument" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:49" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188" xmi:type="uml:Class" name="epo:EvaluationTerm" scope="public">
+				<model package="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" 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="2023-03-12 12:47:53" 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"/>
+				<extendedProperties tagged="0" package_name="evaluation term"/>
 				<links>
-					<Generalization xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" start="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
+					<Generalization xmi:id="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" start="EAID_0C735489_15DC_40a7_A94E_A9202738B188" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" start="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
+					<Generalization xmi:id="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" start="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" xmi:type="uml:Class" name="epo:ProcurementProcedureInformationProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" xmi:type="uml:Class" name="epo:SelectionEvaluationTerm" scope="public">
+				<model package="EAPK_FCD210AB_972F_467a_84FE_72F5CA8FD4A1" 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="2023-03-12 12:48:05" 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"/>
+				<extendedProperties tagged="0" package_name="evaluation term"/>
 				<links>
-					<Generalization xmi:id="EAID_6F4BC75A_C847_4873_8D62_CB3A9307E408" start="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E"/>
+					<Generalization xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" start="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968" xmi:type="uml:Class" name="epo:ProcurementProcessInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-06-04 10:40: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="eProcurementOntology"/>
+				<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="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" xmi:type="uml:Class" name="cccev:Constraint" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-03-10 12:36: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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_C93F8733_06F6_455d_A6BC_F15A85D13C7F" name="epo:isToBeRelaunched" scope="Public">
+					<attribute xmi:idref="EAID_ED90E511_1F3D_4e84_9D31_63CAC92FD094" name="epo:hasThresholdValue" scope="Public">
 						<initial/>
-						<documentation value="Indicator of whether the procurement object is to be relaunched.&#xA;&#xA;Additional information: &#xA;This can be instantiated in the post award phase. &#xA;&#xA;This corresponds in eForms to BT-634	 Procurement Relaunch.&#xA;&#xA;WG Approval: 18/01/2022&#xA;"/>
-						<model ea_localid="2077" ea_guid="{C93F8733-06F6-455d-A6BC-F15A85D13C7F}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The cut-off level for a given concept.&#xA;&#xA;Additional Information:&#xA;This value is given as e.g. a minimum score, a maximum number of tenders with the highest score passing (see codelist at-voc:number-threshold)."/>
+						<model ea_localid="1775" ea_guid="{ED90E511-1F3D-4e84-9D31-63CAC92FD094}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" 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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Dependency xmi:id="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_02014F61_A766_467e_BD3D_7F41689C651B"/>
+					<Generalization xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Association xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" xmi:type="uml:Class" name="cccev:Criterion" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-03-10 12:40: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<attributes>
+					<attribute xmi:idref="EAID_2E954AAA_4A41_46a9_80E7_74981020527C" name="cccev:bias" scope="Public">
+						<initial/>
+						<documentation value="Parameter used to adjust the evaluation of the Criterion.&#xA;&#xA;Additional Information:&#xA;The bias parameter tries to correct a systematic error. For example in procurement, a home bias corresponds to the &quot;presence of local preferences distorting international specialisation and resource allocation&quot;. When quantified, this systematic error can be removed."/>
+						<model ea_localid="2037" ea_guid="{2E954AAA-4A41-46a9-80E7-74981020527C}"/>
+						<properties type="xsd:decimal" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -20624,11 +21358,11 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_2CF0641F_A4F5_48a8_A318_AD34638C5BB3" name="epo:isCompetitionTerminated" scope="Public">
+					<attribute xmi:idref="EAID_676D6F18_AE33_4f71_A555_AC99CF3627D6" name="cccev:weight" scope="Public">
 						<initial/>
-						<documentation value="No further contracts will be awarded in this procedure.&#xA;&#xA;Additional Information: &#xA;This can be instantiated in the post award phase. &#xA;&#xA;PIN for Competition needs to be signaled. This field can be used even if no contracts are awarded in the contract award notice.&#xA;&#xA;This corresponds in eForms to BT-756 PIN Competition Termination."/>
-						<model ea_localid="2076" ea_guid="{2CF0641F-A4F5-48a8-A318-AD34638C5BB3}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Relative importance of the Criterion.&#xA;&#xA;Additional Information:&#xA;The weight must be between 0 and 1. Usually, all Criteria can be integrated within a weighted sum equal to 1."/>
+						<model ea_localid="2038" ea_guid="{676D6F18-AE33-4f71-A555-AC99CF3627D6}"/>
+						<properties type="xsd:decimal" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
@@ -20639,11 +21373,11 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_7BE6C389_5F20_46db_B56A_257BE240D92C" name="epo:isDPSTerminated" scope="Public">
+					<attribute xmi:idref="EAID_4111FA66_AACB_4b42_A23A_1AF9C06417B9" name="cccev:weightingConsiderationDescription" scope="Public">
 						<initial/>
-						<documentation value="End of the Dynamic Purchase System (DPS). &#xA;&#xA;Additional Information: This property can be used in the contract award notice even if no contracts are awarded. &#xA;&#xA;WG Approval 22/11/2019&#xA;"/>
-						<model ea_localid="2088" ea_guid="{7BE6C389-5F20-46db-B56A-257BE240D92C}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Explanation of how the weighting of a Criterion is to be used.&#xA;&#xA;Additional Information:&#xA;This description gives the view of the creator of the Criterion weights on how to interpret and use them during the evaluation process."/>
+						<model ea_localid="2040" ea_guid="{4111FA66-AACB-4b42-A23A-1AF9C06417B9}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
@@ -20656,221 +21390,174 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<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_ABA2D6DE_6BD5_49b4_9900_A82C2C734195" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<Generalization xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Dependency xmi:id="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_31165801_5B33_4e47_B39A_04F149020988"/>
+					<Generalization xmi:id="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_49EC0F16_408C_4b28_B611_0048946DC070" xmi:type="uml:Class" name="epo:ProcurementServiceProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:25" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" xmi:type="uml:Class" name="cccev:Evidence" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" tpos="0" ea_localid="1966" ea_eleType="element"/>
+				<properties documentation="Proof that a Requirement is met.&#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-07-19 15:16:09" modified="2022-07-19 15:33: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="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Association xmi:id="EAID_4714A192_0DFA_49f4_AB11_165E12CB38A6" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Generalization xmi:id="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" start="EAID_49EC0F16_408C_4b28_B611_0048946DC070" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
-					<Association xmi:id="EAID_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
+					<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_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Association xmi:id="EAID_75FE12D8_04B5_410b_8362_9A907C438713" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_CB6F44C9_EE4B_44cf_8CCA_ADF25BA8D171"/>
+					<Association xmi:id="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Dependency xmi:id="EAID_A7C105EE_0251_4249_919A_46302D44059E" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE"/>
+					<Generalization xmi:id="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" xmi:type="uml:Class" name="epo:ProfessionalSuitabilitySummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" xmi:type="uml:Class" name="cccev:InformationConcept" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" tpos="0" ea_localid="1968" ea_eleType="element"/>
+				<properties documentation="Piece of information that the Evidence provides or the Requirement needs." 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="2022-07-19 15:36: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="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_0DA26AD7_BE49_4db1_AA79_96A38D4F56DB" name="epo:describesProfessionRelevantLaw" scope="Public">
+					<attribute xmi:idref="EAID_4BC2BB5B_8A97_4bdd_A15E_C716B815CC13" name="dct:description" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2239" ea_guid="{0DA26AD7-BE49-4db1-AA79-96A38D4F56DB}"/>
+						<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"/>
+						<model ea_localid="2101" ea_guid="{4BC2BB5B-8A97-4bdd-A15E-C716B815CC13}"/>
 						<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"/>
+						<bounds lower="0" upper="*"/>
 						<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">
+					<attribute xmi:idref="EAID_EDACC705_499F_489c_AA49_2F4562A747ED" name="skos:prefLabel" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2240" ea_guid="{85DA2813-C14D-4de1-BF7F-2C1F3E0C5D6F}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The preferred lexical label for a resource, in a given language.&#xA;&#xA;WG approval 30/05/2023&#xA;&#xA;"/>
+						<model ea_localid="2102" ea_guid="{EDACC705-499F-489c-AA49-2F4562A747ED}"/>
+						<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;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_F84EB591_D812_40e9_A95F_3E051ECF3AE8" name="epo:describesProfession" scope="Public">
-						<initial/>
-						<documentation/>
-						<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"/>
-						<containment containment="Not Specified" position="2"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_4A4C0A9C_E865_4a6a_B108_12037190211E" start="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" xmi:type="uml:Class" name="epo:Project" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18: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="classes"/>
-				<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"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" xmi:type="uml:Class" name="epo:PurchaseContract" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:58" 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_3675E499_10A4_457e_9458_83E0C40CEC9A" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
-					<Association xmi:id="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
-					<Association xmi:id="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5"/>
+					<Association xmi:id="EAID_D9C75333_AC70_477b_AA0D_15C3CB11CC0C" start="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Generalization xmi:id="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Association xmi:id="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Association xmi:id="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" xmi:type="uml:Class" name="epo:QualificationCriteriaSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" xmi:type="uml:Class" name="cccev:Requirement" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-04-24 01:06: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="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_91A9B7A4_DF99_409a_B7EC_1F11AB228F3E" name="epo:hasQualificationCondition" scope="Public">
+					<attribute xmi:idref="EAID_8C66D14F_4A31_454e_9AA2_45BD4C3E92E9" name="dct:description" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2382" ea_guid="{91A9B7A4-DF99-409a-B7EC-1F11AB228F3E}"/>
+						<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"/>
+						<model ea_localid="2046" ea_guid="{8C66D14F-4A31-454e-9AA2-45BD4C3E92E9}"/>
 						<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="*"/>
+						<bounds lower="0" upper="1"/>
 						<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">
+					<attribute xmi:idref="EAID_76501C03_8E25_4f73_ACD2_B452220092B4" name="skos:prefLabel" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2383" ea_guid="{EB158250-E9F3-442e-8CF7-7CC26E757EE5}"/>
+						<documentation value="The preferred lexical label for a resource, in a given language.&#xA;&#xA;WG approval 30/05/2023"/>
+						<model ea_localid="2048" ea_guid="{76501C03-8E25-4f73-ACD2-B452220092B4}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD" start="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
-					<Generalization xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" start="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
-					<Generalization xmi:id="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A" start="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" xmi:type="uml:Class" name="epo:QualificationCriterion" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" start="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Generalization xmi:id="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" start="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
-					<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_A91B204C_7A0E_4608_A8D0_545E069052CC" xmi:type="uml:Class" name="epo:RequestForClarification" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" start="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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_6459B897_AEE0_4ae9_BFBB_56453EA7473F" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Association xmi:id="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" start="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Association xmi:id="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6" start="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Generalization xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" start="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Generalization xmi:id="EAID_C289FCF6_9241_4f06_BF53_F99082792332" start="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<NoteLink xmi:id="EAID_E9117CC9_4B7F_4764_9040_E7244E1783CC" start="EAID_6F8E1C63_1DFD_4054_B253_1464F8C856A8" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Generalization xmi:id="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" start="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" xmi:type="uml:Class" name="epo:RequestForParticipation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:49" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" xmi:type="uml:Class" name="epo:AwardCriteriaSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-06-08 12:06: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Generalization xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" start="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" start="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" xmi:type="uml:Class" name="epo:ReviewDecision" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:23:03" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" xmi:type="uml:Class" name="epo:AwardCriterion" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-30 16:28: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_E6D7A48F_CB77_4e9d_93C3_62DD41ADF53D" name="epo:hasDecisionDate" scope="Public">
+					<attribute xmi:idref="EAID_AA86F070_25D3_46df_95DD_5B5DE9E1726B" name="epo:hasAwardCriteriaStatedInProcurementDocuments" scope="Public">
 						<initial/>
-						<documentation value="The date of the review decision.&#xA;&#xA;Additional information:&#xA;This attribute corresponds to the BT-787 Review Date in eForms.&#xA;"/>
-						<model ea_localid="2055" ea_guid="{E6D7A48F-CB77-4e9d-93C3-62DD41ADF53D}"/>
-						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_4FD10EB5_5FE5_4f22_A0BA_CF6DF5927076" name="epo:hasFixedValue" scope="Public">
+						<initial/>
+						<documentation value="This corresponds in the eForms to BT-541 Award Criterion Number in association with BT-5422	 Award Criterion Number Fixed."/>
+						<model ea_localid="1556" ea_guid="{4FD10EB5-5FE5-4f22-A0BA-CF6DF5927076}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -20881,250 +21568,166 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Association xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
-					<Dependency xmi:id="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_E95530AB_B746_4056_8805_0F3BB79051BE"/>
-					<Association xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Dependency xmi:id="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
-					<Dependency xmi:id="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA"/>
+					<Generalization xmi:id="EAID_E006DB35_535D_4444_B447_89D7A813874C" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Dependency xmi:id="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8"/>
+					<Dependency xmi:id="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1"/>
+					<Association xmi:id="EAID_85A133A7_B643_4be4_BECC_55BA9277D3E5" start="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198" end="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
+					<Association xmi:id="EAID_B5467B84_956A_4b79_8469_069C219DEFD9" start="EAID_640F316F_44B1_44a6_9B37_FD17A852946F" end="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" xmi:type="uml:Class" name="epo:Reviewer" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:25" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" xmi:type="uml:Class" name="epo:EconomicStandingSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-02 16:36:01" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Dependency xmi:id="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8"/>
-					<Generalization xmi:id="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" start="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
+					<Generalization xmi:id="EAID_35039C01_2836_47b3_898F_14269D31CF88" start="EAID_E47E88D6_0393_469c_89FB_39DC4844FBCE" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" xmi:type="uml:Class" name="epo:ReviewIrregularitySummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" xmi:type="uml:Class" name="epo:ExclusionGround" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-30 16:28:13" 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_70D1117D_4D56_407f_AC7F_3F2241342033" name="epo:hasReviewIrregularityCount" scope="Public">
-						<initial/>
-						<documentation value="The number of requests for a given irregularity.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-635 Buyer Review Requests Count."/>
-						<model ea_localid="2019" ea_guid="{70D1117D-4D56-407f-AC7F-3F2241342033}"/>
-						<properties type="xsd:integer" 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>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Generalization xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
-					<Dependency xmi:id="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
-					<Association xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
+					<Generalization xmi:id="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" start="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
+					<Association xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
+					<Association xmi:id="EAID_5B73AEFB_F659_439b_9785_A42DDD528189" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
+					<Association xmi:id="EAID_CDBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" xmi:type="uml:Class" name="epo:ReviewObject" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:23:03" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" xmi:type="uml:Class" name="epo:ExclusionGroundsSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-01-24 17:20:32" 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_F646BAC9_50C9_427a_A35D_6F824C0B5371" name="epo:hasElementReference" scope="Public">
-						<initial/>
-						<documentation value="Reference to the class instance in the current notice.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-13716 Change Previous Notice Section Identifier, BT-786	    Review Notice Section Identifier and BT-1501	    Modification Previous Notice Section Identifier."/>
-						<model ea_localid="2056" ea_guid="{F646BAC9-50C9-427a-A35D-6F824C0B5371}"/>
-						<properties type="xsd:anyURI" 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_E1570BF4_A663_4c85_A496_E79BDE625A17" name="epo:hasReviewURL" scope="Public">
-						<initial/>
-						<documentation value="The internet address of the documents concerning the review instance.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-794 Review URL.&#xA;"/>
-						<model ea_localid="2015" ea_guid="{E1570BF4-A663-4c85-A496-E79BDE625A17}"/>
-						<properties type="xsd:anyURI" 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;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-				</attributes>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Association xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Generalization xmi:id="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Generalization xmi:id="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Association xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Association xmi:id="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Generalization xmi:id="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<NoteLink xmi:id="EAID_D16E8CBE_1896_4301_B20D_B5228F72117A" start="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Generalization xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" start="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" xmi:type="uml:Class" name="epo:ReviewProcedureInformationProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:25" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" xmi:type="uml:Class" name="epo:ParticipationCondition" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-30 16:33: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Generalization xmi:id="EAID_DE32781C_3C61_477f_8C9C_A94EFF7F2822" start="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B"/>
+					<Dependency xmi:id="EAID_76DEFDDE_AF78_4e23_8B84_0C6E8B387AD5" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6"/>
+					<Generalization xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" xmi:type="uml:Class" name="epo:ReviewRequest" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:23:03" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" xmi:type="uml:Class" name="epo:ParticipationConditionsSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-01-24 17:20:16" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_DF825E2F_0CD1_4414_A52F_5BC33374FE6D" name="epo:hasNumberOfReviewRequests" scope="Public">
-						<initial/>
-						<documentation value="The number of requests the buyer received to review any of its decisions."/>
-						<model ea_localid="1991" ea_guid="{DF825E2F-0CD1-4414-A52F-5BC33374FE6D}"/>
-						<properties type="xsd:integer" 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>
-					<attribute xmi:idref="EAID_661FB233_D59B_44ce_A5E7_049DA74AA55E" name="epo:isWithdrawn" scope="Public">
+					<attribute xmi:idref="EAID_5699166A_F9A9_4ed3_8B7D_8A8A4C4E0014" name="epo:describesObjectiveParticipationRules" scope="Public">
 						<initial/>
-						<documentation value="The review request was withdrawn.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-796 Review Request Withdrawn."/>
-						<model ea_localid="2016" ea_guid="{661FB233-D59B-44ce-A5E7-049DA74AA55E}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
 						<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_59422748_C11F_437d_8F7E_44D4FAF1B79E" name="epo:hasWithdrawalDate" scope="Public">
-						<initial/>
-						<documentation value="The date and time when the request for review was withdrawn.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-797 Review Request Withdrawn Date."/>
-						<model ea_localid="2017" ea_guid="{59422748-C11F-437d-8F7E-44D4FAF1B79E}"/>
-						<properties type="xsd:date" 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;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_383157AA_E023_4686_B908_2AA037456757" name="epo:hasWithdrawalReason" scope="Public">
+					<attribute xmi:idref="EAID_F79D34B1_CCFA_4297_8DDC_3871A35AD86D" name="epo:describesVerificationMethod" scope="Public">
 						<initial/>
-						<documentation value="The explanation for withdrawing the request for review.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-798 Review Request Withdrawn Reasons"/>
-						<model ea_localid="2018" ea_guid="{383157AA-E023-4686-B908-2AA037456757}"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DAD71412_37CA_4488_BBCA_E16D118CC6D8" name="epo:hasRequestDate" scope="Public">
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_0EC24453_1D32_4b47_B797_31C56125A97E" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6"/>
+					<Generalization xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" xmi:type="uml:Class" name="epo:ProcurementCriteriaSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-01-24 17:32: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<attributes>
+					<attribute xmi:idref="EAID_41E8D101_053A_4b0b_93CE_CA1C3787B4A3" name="epo:indicatesPerformingStaffInformationRequirement" scope="Public">
 						<initial/>
-						<documentation value="The date when the review request was submitted.&#xA;&#xA;Additional information:&#xA;This attribute corresponds to the BT-787 Review Date in eForms.&#xA;"/>
-						<model ea_localid="2054" ea_guid="{DAD71412-37CA-4488-BBCA-E16D118CC6D8}"/>
-						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
-					<Dependency xmi:id="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
-					<Association xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Dependency xmi:id="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_E95530AB_B746_4056_8805_0F3BB79051BE"/>
-					<Association xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" xmi:type="uml:Class" name="epo:ReviewRequester" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20: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_7B0A44E0_63E1_4c30_AB83_DA8166C24C14" start="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
+					<Generalization xmi:id="EAID_80871174_3D03_47c3_B90A_189BA5F246D6" start="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D" end="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC"/>
+					<Generalization xmi:id="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C" start="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					<Generalization xmi:id="EAID_48B39F0F_A79C_4ac8_995B_59C79DE365BD" start="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					<Association xmi:id="EAID_DB9BB27E_7F36_41c3_8166_36C3538F2F3A" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					<Generalization xmi:id="EAID_EE3FD9AF_3712_4b11_9970_82968E7EB99F" start="EAID_44E6EE1C_AF22_4586_B990_EF3674BAE826" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" xmi:type="uml:Class" name="epo:ReviewRequestSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" xmi:type="uml:Class" name="epo:ProcurementCriterion" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-03-12 12:51: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_D66D3445_8E47_4d04_95BC_AFD636549F08" name="epo:hasTotalNumberOfComplainants" scope="Public">
+					<attribute xmi:idref="EAID_53D15EA1_B17A_48ea_983D_0A065FE34A6C" name="epo:hasFormula" scope="Public">
 						<initial/>
-						<documentation value="The number of economic operators that requested 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.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-712	    Buyer Review Complainants&#xA;&#xA;WG Approval 11/04/2019"/>
-						<model ea_localid="1990" ea_guid="{D66D3445-8E47-4d04-95BC-AFD636549F08}"/>
-						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<documentation value="The mathematical equation or any other description used for complicated weighing of criteria (e.g. non-linear weighing, the analytic hierarchy process) when a weighing cannot be expressed per criterion. &#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-543."/>
+						<model ea_localid="1781" ea_guid="{53D15EA1-B17A-48ea-983D-0A065FE34A6C}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21135,122 +21738,115 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
-					<Generalization xmi:id="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
-					<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_24D502F3_9569_4211_9D5F_B91738202FE7" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_3A26D4B3_0F2F_4513_90E4_F69631B6BEE6"/>
+					<Dependency xmi:id="EAID_277C636A_D943_484f_A80D_69ACBFA6147C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006"/>
+					<Dependency xmi:id="EAID_849B9DC8_4F7D_4023_8EA7_36C327FE63FE" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58"/>
+					<Association xmi:id="EAID_867949C8_0635_450e_85A4_AC036D959E8C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_5B748559_6ACE_401d_8620_2277FC03CBEF"/>
+					<Association xmi:id="EAID_8C02C1C9_9374_471a_8C42_F2BF4DE15D1A" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_8E88CD3B_9370_40c9_945F_A8FD72FBF8A4"/>
+					<Generalization xmi:id="EAID_ACA750D2_84FF_4e07_B735_322F9131A442" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D"/>
+					<Association xmi:id="EAID_D65C20FC_D382_4766_9563_4C96020D607C" start="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" end="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1"/>
+					<Generalization xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" start="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Association xmi:id="EAID_18CF5F1B_45DD_4b29_9E28_8D741E0840F3" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Association xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Generalization xmi:id="EAID_E006DB35_535D_4444_B447_89D7A813874C" start="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Generalization xmi:id="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" start="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Association xmi:id="EAID_FC7073E1_3362_472f_B087_27A619B6C819" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" xmi:type="uml:Class" name="epo:ReviewTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:21" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" xmi:type="uml:Class" name="epo:ProfessionalSuitabilitySummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-02 16:34:26" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_23C008E4_9460_4e04_BCD7_38CCB8AFA518" name="epo:hasReviewProcedure" scope="Public">
+					<attribute xmi:idref="EAID_0DA26AD7_BE49_4db1_AA79_96A38D4F56DB" name="epo:describesProfessionRelevantLaw" scope="Public">
 						<initial/>
-						<documentation value="The description of the method used to request the verification that the procedure has been carried out correctly.&#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="2435" ea_guid="{23C008E4-9460-4e04-BCD7-38CCB8AFA518}"/>
+						<documentation/>
+						<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"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_BB5F43BE_8210_42d8_9286_649347222247" name="epo:hasReviewDeadline" scope="Public">
+					<attribute xmi:idref="EAID_85DA2813_C14D_4de1_BF7F_2C1F3E0C5D6F" name="epo:hasServiceReservedToParticularProfession" scope="Public">
 						<initial/>
-						<documentation value="The time limit for review procedures.&#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="2436" ea_guid="{BB5F43BE-8210-42d8-9286-649347222247}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation/>
+						<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"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_D0AD81EC_4513_4003_8F57_CB232AF26678" name="epo:hasReviewDeadlineInformation" scope="Public">
+					<attribute xmi:idref="EAID_F84EB591_D812_40e9_A95F_3E051ECF3AE8" name="epo:describesProfession" scope="Public">
 						<initial/>
-						<documentation value="The description of the time limits for review procedures.&#xA;&#xA;WG Approval 01/10/2019"/>
-						<model ea_localid="2437" ea_guid="{D0AD81EC-4513-4003-8F57-CB232AF26678}"/>
+						<documentation/>
+						<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"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_1B531817_E843_4c42_8EA1_111804B30C38" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_07601514_1C57_47ce_9A2D_CD97C5116067"/>
-					<Association xmi:id="EAID_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B"/>
-					<Generalization xmi:id="EAID_B3295353_448F_433c_921A_A4E96D0B2738" start="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
+					<Generalization xmi:id="EAID_4A4C0A9C_E865_4a6a_B108_12037190211E" start="EAID_CACB5357_5E4E_455f_8BFF_A7D6264C2555" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" xmi:type="uml:Class" name="epo:SecurityClearanceTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:28" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" xmi:type="uml:Class" name="epo:QualificationCriteriaSummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-05 12:20: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="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
-					<attribute xmi:idref="EAID_FDA0BF50_CABF_495e_8376_7F059C142FA2" name="epo:hasDeadline" scope="Public">
+					<attribute xmi:idref="EAID_91A9B7A4_DF99_409a_B7EC_1F11AB228F3E" name="epo:hasQualificationCondition" 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;"/>
-						<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"/>
+						<documentation/>
+						<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"/>
 						<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_58B626C6_3D05_426d_B057_4FE0D785D8C5" 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"/>
-						<model ea_localid="1772" ea_guid="{58B626C6-3D05-426d-B057-4FE0D785D8C5}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
-						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8710D5D2_1B92_4286_8D4C_A392932D7D7E" name="epo:isSecurityClearanceRequired" scope="Public">
+					<attribute xmi:idref="EAID_EB158250_E9F3_442e_8CF7_7CC26E757EE5" name="epo:hasConditionVerificationMethod" scope="Public">
 						<initial/>
 						<documentation/>
-						<model ea_localid="2429" ea_guid="{8710D5D2-1B92-4286-8D4C-A392932D7D7E}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;"/>
@@ -21259,33 +21855,35 @@
 					</attribute>
 				</attributes>
 				<links>
-					<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_48B39F0F_A79C_4ac8_995B_59C79DE365BD" start="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89" end="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D"/>
+					<Generalization xmi:id="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" start="EAID_AE22E69E_F035_4a34_A84F_629922B88DE1" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
+					<Generalization xmi:id="EAID_8D1FC032_83F1_4753_BF39_B673852D3F9A" start="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB" end="EAID_D30CA295_332C_406c_8FF3_8D3665D95B89"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608" xmi:type="uml:Class" name="epo:SelectedCandidateList" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" xmi:type="uml:Class" name="epo:QualificationCriterion" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-30 16:32: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="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Association xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32"/>
-					<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_0EF2D4DC_7ED0_457c_8310_43761AC8295C" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
+					<Generalization xmi:id="EAID_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" start="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
+					<Generalization xmi:id="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" start="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
+					<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_8AE4C3CE_22B6_4940_B998_737CC28550AB" xmi:type="uml:Class" name="epo:SelectionCriteriaSummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="2593" ea_eleType="element"/>
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-01-24 17:20:38" modified="2023-01-24 17:20:46" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
 					<attribute xmi:idref="EAID_3A627DC2_E5DD_431b_8A44_E0CCD873D80E" name="epo:hasSelectionCriteriaStatedInProcurementDocuments" scope="Public">
 						<initial/>
@@ -21326,14 +21924,14 @@
 				</links>
 			</element>
 			<element xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" xmi:type="uml:Class" name="epo:SelectionCriterion" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="942" ea_eleType="element"/>
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-07-17 18:22:05" complexity="1" status="Proposed"/>
+				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 16:56:43" modified="2023-05-30 16:28:05" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<attributes>
 					<attribute xmi:idref="EAID_3EDCE2F4_B119_4b3b_8873_8E1E9D97CE99" name="epo:isUsedForCandidateRestriction" scope="Public">
 						<initial/>
@@ -21355,60 +21953,215 @@
 					<Dependency xmi:id="EAID_A78FA1C1_2940_4ad1_A3A2_FA8F430848B1" start="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" end="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3"/>
 					<Dependency xmi:id="EAID_AF66C86B_C371_4afb_8012_8F091434E4D3" start="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" end="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2"/>
 					<Generalization xmi:id="EAID_B61D93A6_A88F_4730_93D5_612F44B8ECE4" start="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" end="EAID_AA219EF8_61F6_4904_99E1_9F2BC2B995BD"/>
+					<Association xmi:id="EAID_4EB90EAA_7715_466f_B3EC_07F4892C035E" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122"/>
+					<Association xmi:id="EAID_EA5013BD_1CE9_454b_9F1D_5A805EEFD17D" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" xmi:type="uml:Class" name="epo:SelectionEvaluationTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:49" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" xmi:type="uml:Class" name="epo:TechnicalAbilitySummary" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-05-02 16:37:01" 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"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
 				<links>
-					<Generalization xmi:id="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" start="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" end="EAID_0C735489_15DC_40a7_A94E_A9202738B188"/>
+					<Generalization xmi:id="EAID_829CE86D_DCFB_48b2_AA55_2065496F072C" start="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" xmi:type="uml:Class" name="epo:SocialProcurement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="943" ea_eleType="element"/>
-				<properties documentation="An instance of the class SocialProcurement  is represented in eForms with the code &quot;soc-obj&quot; defined in the codelist Strategic-Procurement.&#xA;&#xA;&#xA;Research (21/01/2020): &#xA;Socially Responsible Public Procurement (SRPP):&#xA;&#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="2023-07-17 18:22:16" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" xmi:type="uml:Class" name="epo:CertificationLabel" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-09-01 16:17: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<attributes>
+					<attribute xmi:idref="EAID_E5097931_AB6F_4533_9B27_84455D46F093" name="epo:hasReferenceURI" scope="Public">
+						<initial/>
+						<documentation value="A reference to where the label specification (norms, expectations, standards and policies) can be found.&#xA;&#xA;WG approval 26/07/2022"/>
+						<model ea_localid="2105" ea_guid="{E5097931-AB6F-4533-9B27-84455D46F093}"/>
+						<properties type="xsd:anyURI" 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_5C87BC92_AF78_4f16_994C_2F6853BD9DA7" start="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" end="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955"/>
-					<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_8210E652_8F84_48dd_BE0E_772ACFDB16C5" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_86057FC2_7717_4160_8952_6A9F572F43B2"/>
+					<Dependency xmi:id="EAID_B62DE754_3523_45c7_9426_333EF3B4B423" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03"/>
+					<Association xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" xmi:type="uml:Class" name="epo:StatisticalInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" xmi:type="uml:Class" name="epo:Certificate" scope="public">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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="2023-09-01 16:17: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<attributes>
+					<attribute xmi:idref="EAID_54DC11DF_DA18_4262_A463_6D90A10A85D1" name="epo:hasCertificationNumber" scope="Public">
+						<initial/>
+						<documentation value="The unique identifier of the certificate.&#xA;&#xA;WG approval 26/07/2022"/>
+						<model ea_localid="2090" ea_guid="{54DC11DF-DA18-4262-A463-6D90A10A85D1}"/>
+						<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>
+					<attribute xmi:idref="EAID_54479CB6_87F3_4910_BFF6_0EAAC1E6F403" name="epo:hasURL" scope="Public">
+						<initial/>
+						<documentation value="The identifier of a resource.&#xA;&#xA;Additional Information&#xA;&#xA;For example:&#xA;&#xA;1. The URL of the system from where to access the procurement documents;&#xA;2. The URL of the system for the submission of tender documents;&#xA;3. The URL of the system from where to download a tool to communicate with the Buyer;&#xA;4. The URL of the system used by a Technique to allow Economic Operators to exchange information with the Buyer (e.g. eAuction and DPS Systems)&#xA;5. The URL of the system used to exchange information between Buyer and EO for questions and clarifications;&#xA;&#xA;WG Approval 30/09/2019&#xA;"/>
+						<model ea_localid="2086" ea_guid="{54479CB6-87F3-4910-BFF6-0EAAC1E6F403}"/>
+						<properties type="xsd:anyURI" 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>
-					<Generalization xmi:id="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" start="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
-					<Generalization xmi:id="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
-					<Generalization xmi:id="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
-					<Generalization xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+					<Generalization xmi:id="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9"/>
+					<Association xmi:id="EAID_97176015_1FBF_4d9c_9A77_C246A6F21E71" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1"/>
+					<Association xmi:id="EAID_C3BED690_3A74_4118_8357_6957359310FB" start="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" end="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C"/>
+					<Association xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Association xmi:id="EAID_6749101F_45CB_45ba_9792_E3508C6FE92A" start="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+					<Association xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
+				</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_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<links>
+					<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="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" xmi:type="uml:ProxyConnector" name="ProxyConnector" scope="public" classifier="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" 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"/>
+				<style appearance="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=1;HSwimLanes=1;BorderStyle=0;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="criterion"/>
+				<links>
+					<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_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" xmi:type="uml:Package" name="strategic procurement" scope="public">
+				<model package2="EAID_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-28 16:44:32" 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="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="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" xmi:type="uml:Class" name="epo:GreenProcurement" scope="public">
+				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" 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="2023-08-31 18:01: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="strategic procurement"/>
+				<attributes>
+					<attribute xmi:idref="EAID_DD6655FC_E79A_4249_A596_0EDB3DECCE55" name="epo:usesCleanVehicleDirective" scope="Public">
+						<initial/>
+						<documentation value="The procurement falls within the scope of the European Parliament and Council 2009/33/EC (Clean Vehicles Directive – CVD)."/>
+						<model ea_localid="2434" ea_guid="{DD6655FC-E79A-4249-A596-0EDB3DECCE55}"/>
+						<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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_6AA28D6E_E3E3_40d8_A409_4F5F708BC856" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728"/>
+					<Dependency xmi:id="EAID_9E45040E_9573_4ec2_971F_0407E27D9413" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3"/>
+					<Generalization xmi:id="EAID_C15E132C_206B_4dd4_976E_204541847F5F" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+					<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_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" xmi:type="uml:Class" name="epo:InnovativeProcurement" scope="public">
+				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" 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="2023-08-31 18:00:44" 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="strategic procurement"/>
+				<links>
+					<Generalization xmi:id="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80" start="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
+					<Dependency xmi:id="EAID_F362F8D3_4A45_4dc9_AC9E_9CBFCA6E5549" start="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" end="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" xmi:type="uml:Class" name="epo:SocialProcurement" scope="public">
+				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" 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="2023-08-31 18:03:24" 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="strategic procurement"/>
+				<links>
+					<Dependency xmi:id="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7" start="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" end="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955"/>
+					<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_B104B43A_9BF1_424a_98A6_28E358A11BEA" xmi:type="uml:Class" name="epo:StrategicProcurement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" tpos="0" ea_localid="945" ea_eleType="element"/>
+				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" 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="2023-07-17 18:22:16" complexity="1" status="Proposed"/>
+				<project author="estaromi" version="1.0" phase="1.0" created="2019-04-02 14:47:14" modified="2023-03-12 12:55:53" 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"/>
+				<extendedProperties tagged="0" package_name="strategic procurement"/>
 				<attributes>
 					<attribute xmi:idref="EAID_0D693C4B_7C22_4de2_97E6_B0EAE94F70B9" name="epo:hasNonAccessibilityCriterionJustification" scope="Public">
 						<initial/>
@@ -21449,38 +22202,38 @@
 					<Generalization xmi:id="EAID_C15E132C_206B_4dd4_976E_204541847F5F" start="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" xmi:type="uml:Class" name="epo:SubcontractingEstimate" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
-				<code gentype="Java"/>
+			<element xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" xmi:type="uml:Class" name="epo:VehicleInformation" scope="public">
+				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" 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="2023-07-03 18:58: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="strategic procurement"/>
 				<attributes>
-					<attribute xmi:idref="EAID_664E6716_07BA_4b02_9D13_99D00FD703DB" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_5B166BB3_0A29_4594_97B0_16D705A9F927" name="epo:hasTotalVehicles" 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"/>
-						<model ea_localid="1805" ea_guid="{664E6716-07BA-4b02-9D13-99D00FD703DB}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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;"/>
+						<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"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="13"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_961CE08A_C085_4834_BA34_2B1691E8A7F4" name="epo:hasEstimatedPercentage" scope="Public">
+					<attribute xmi:idref="EAID_79CEE53B_719C_42c2_8AE2_8FB4C6159B75" name="epo:hasZeroEmissionVehicles" scope="Public">
 						<initial/>
-						<documentation value="The estimated proportion foreseen to be subcontracted.&#xA;&#xA;WG Approval 07/01/2020"/>
-						<model ea_localid="1806" ea_guid="{961CE08A-C085-4834-BA34-2B1691E8A7F4}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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;"/>
+						<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"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="16"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21489,15 +22242,15 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_467A3DAE_DEA8_4237_9133_432198D98388" name="epo:hasSubjectMatter" scope="Public">
+					<attribute xmi:idref="EAID_9437602D_8F8F_47f4_A458_A53DAE08FDF0" name="epo:hasCleanVehicles" 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"/>
-						<model ea_localid="1811" ea_guid="{467A3DAE-DEA8-4237-9133-432198D98388}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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"/>
-						<containment containment="Not Specified" position="7"/>
+						<containment containment="Not Specified" position="17"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -21506,39 +22259,79 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Generalization xmi:id="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
-					<Association xmi:id="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
+					<Association xmi:id="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
+					<Dependency xmi:id="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D"/>
+					<Dependency xmi:id="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_63483BB6_C796_4631_87DA_3F3808C4744F"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" xmi:type="uml:Class" name="epo:Subcontractor" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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 well 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="2023-07-17 18:20:19" complexity="1" status="Proposed"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-29 16:46: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="eProcurementOntology"/>
+				<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="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" xmi:type="uml:Class" name="epo:DynamicPurchaseSystemTechnique" scope="public">
+				<model package="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" 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="2023-05-24 13:31:31" 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"/>
+				<extendedProperties tagged="0" package_name="technique"/>
 				<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"/>
+					<Generalization xmi:id="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Dependency xmi:id="EAID_C3F5DF0E_730A_416e_9244_87A3BCAC0065" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" xmi:type="uml:Class" name="epo:SubcontractTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:44" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" xmi:type="uml:Class" name="epo:EAuctionTechnique" scope="public">
+				<model package="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" 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="2023-06-12 17:46: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="technique"/>
+				<links>
+					<Generalization xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" start="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" xmi:type="uml:Class" name="epo:FrameworkAgreementTechnique" scope="public">
+				<model package="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" 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="2023-05-24 14:32:25" 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="technique"/>
+				<links>
+					<Generalization xmi:id="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0" start="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A" xmi:type="uml:Class" name="epo:Technique" scope="public">
+				<model package="EAPK_CE51803B_0AE8_49b5_9890_19298C39BFB5" 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="2023-05-30 16:14: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"/>
+				<extendedProperties tagged="0" package_name="technique"/>
 				<attributes>
-					<attribute xmi:idref="EAID_256489E4_B6B6_412c_AD17_AD3730D5DFBA" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_72399903_AD44_401f_A23C_F48405982480" 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"/>
-						<model ea_localid="1807" ea_guid="{256489E4-B6B6-412c-AD17-AD3730D5DFBA}"/>
+						<model ea_localid="1834" ea_guid="{72399903-AD44-401f-A23C-F48405982480}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="1"/>
@@ -21550,12 +22343,69 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DE9DB4E1_0EA6_4dca_BE6B_B5F4FE407B6E" name="epo:hasMaximumShare" scope="Public">
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_8FF77444_1F49_4895_AA8E_5C76444F3AE1" start="EAID_3780AA50_D898_4068_B300_47B46651CA0A" end="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3"/>
+					<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_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Generalization xmi:id="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Association xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Generalization xmi:id="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0" start="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+					<Generalization xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" start="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
+				</links>
+			</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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2023-07-13 07:45: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="eProcurementOntology"/>
+				<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="EAID_E7437025_771F_4143_BE33_620A29646687" xmi:type="uml:Class" name="epo:AwardOutcome" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-26 15:15:33" 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="award"/>
+				<links>
+					<Dependency xmi:id="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B63C4BE8_86E2_494f_AB88_882E3568B3F0"/>
+					<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_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
+					<Generalization xmi:id="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
+					<Dependency xmi:id="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_D46376EC_6B98_4926_8627_A594E6819D78"/>
+					<Association xmi:id="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Generalization xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<Association xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<Generalization xmi:id="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<Association xmi:id="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" xmi:type="uml:Class" name="epo:LotAwardOutcome" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-27 10:58: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="award"/>
+				<attributes>
+					<attribute xmi:idref="EAID_AEA68A37_2465_4986_9670_843B221BB214" name="epo:hasNonAwardedContractTitle" scope="Public">
 						<initial/>
-						<documentation value="The maximum proportion of something to be distributed.&#xA;&#xA;Additional Information:&#xA;In the case of subcontracting the share may refer to the proportion of works, services or supplies being subcontracted.&#xA;&#xA;WG Approval 17/09/2019 &#xA;&#xA;"/>
-						<model ea_localid="1808" ea_guid="{DE9DB4E1-0EA6-4dca-BE6B-B5F4FE407B6E}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="The title the contract would have had if it had been awarded. &#xA;&#xA;Additional information:&#xA;&#xA;This field is provided to support the data provided in the TED Standard Forms, and it should be discontinued in the future. &#xA;&#xA;WG agreement: 06/09/2022"/>
+						<model ea_localid="2114" ea_guid="{AEA68A37-2465-4986-9670-843B221BB214}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -21565,12 +22415,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_A8247705_906D_4a85_A700_40F3E3506692" name="epo:hasMinimumShare" scope="Public">
+					<attribute xmi:idref="EAID_836F6511_2E62_4d10_8AC1_07C24D6A907F" name="epo:hasNonAwardedContractNumber" scope="Public">
 						<initial/>
-						<documentation value="The minimum proportion of something to be distributed.&#xA;&#xA;Additional Information:&#xA;In the case of subcontracting the share may refer to the proportion of works, services or supplies being subcontracted.&#xA;&#xA;WG Approval 17/09/2019"/>
-						<model ea_localid="1809" ea_guid="{A8247705-906D-4a85-A700-40F3E3506692}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="The number the contract would have had if it had been awarded. &#xA;&#xA;Additional information:&#xA;&#xA;This field is provided to support the data provided in the TED Standard Forms, and it should be discontinued in the future. &#xA;&#xA;WG agreement: 06/09/2022&#xA;"/>
+						<model ea_localid="2115" ea_guid="{836F6511-2E62-4d10-8AC1-07C24D6A907F}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -21580,74 +22430,105 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_999AAF46_5E6C_43b3_ACEB_B3E3DEF42F46" name="epo:hasSubcontractingInvolved" scope="Public">
-						<initial/>
-						<documentation value="List of Subcontractors and the subject matter they cover are required.&#xA;&#xA;Additional Information: &#xA;The tenderer will ned to supply this information in the tender.&#xA;&#xA;WG Approval 28/02/2019"/>
-						<model ea_localid="1810" ea_guid="{999AAF46-5E6C-43b3-ACEB-B3E3DEF42F46}"/>
-						<properties type="xsd:boolean" 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="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_E4C9B9DC_BAAD_40d2_B56F_21B5FDF8C067" name="epo:hasMinimumSubcontractorsProposedObligation" scope="Public">
-						<initial/>
-						<documentation value="The minimum percentage of the contract value that the contractor must subcontract.&#xA;&#xA;Additional information:&#xA;This is used for the competitive procedure described in Title III of Directive 2009/81/EC. &#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1812" ea_guid="{E4C9B9DC-BAAD-40d2-B56F-21B5FDF8C067}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_CB6A57C6_ED53_40e1_806D_C89FF9D2DCC9" name="epo:hasSubcontractorsProposedAboveObligation" scope="Public">
-						<initial/>
-						<documentation value="The maximum percentage of the contract value that the contractor must subcontract.&#xA;&#xA;Additional information:&#xA;This is used for the competitive procedure described in Title III of Directive 2009/81/EC. &#xA;&#xA;WG Approval 09/11/2021"/>
-						<model ea_localid="1814" ea_guid="{CB6A57C6-ED53-40e1-806D-C89FF9D2DCC9}"/>
-						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="8"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Generalization xmi:id="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<Dependency xmi:id="EAID_C8DDF2AD_D50E_4225_A715_E7C9368CEB39" start="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" end="EAID_9134CB43_EE09_4c07_80C3_3F39DFD09011"/>
-					<Association xmi:id="EAID_F593B546_502A_413a_8694_914903478877" start="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" end="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561"/>
+					<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_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"/>
+					<Association xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<Association xmi:id="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" xmi:type="uml:Class" name="epo:SubmissionStatisticalInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:41" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" xmi:type="uml:Class" name="epo:LotGroupAwardInformation" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-27 10:58: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="award"/>
+				<links>
+					<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_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"/>
+					<Association xmi:id="EAID_FA76DFA8_9FC1_4db0_86FF_2CE55FF62AB6" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" xmi:type="uml:Class" name="epo:MiniCompetitionAwardOutcome" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-27 11:11: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="award"/>
+				<links>
+					<Association xmi:id="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
+					<Generalization xmi:id="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<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_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" xmi:type="uml:Class" name="epo:NoticeAwardInformation" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-27 10:58: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="award"/>
+				<links>
+					<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_38F70CB6_EA38_4786_82CF_5486AAD496C1" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_D847D616_70DB_473a_A2A4_6665F938474C"/>
+					<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_59564C5C_30DE_429b_AE68_D4CA3CC6E260" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2"/>
+					<Generalization xmi:id="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<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_949017B7_0159_4fe1_8469_562A93DEF12E" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" 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_76074F10_F8BD_4e56_929F_478C3A0B8424" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+					<Association xmi:id="EAID_9C96E83D_792B_44cd_BDF4_F589B6CAC7A1" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+					<Association xmi:id="EAID_BBBA098A_C04A_4c7d_A8BE_2A965642DCD3" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+					<Association xmi:id="EAID_F053A3B1_64BB_454a_8FCF_CE8415CE3F22" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_6966846F_842F_4149_A95B_AE374D603608" xmi:type="uml:Class" name="epo:SelectedCandidateList" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-05-30 16:53: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="award"/>
+				<links>
+					<Association xmi:id="EAID_007753B6_365D_4082_8CC4_DA85F79E7124" start="EAID_6966846F_842F_4149_A95B_AE374D603608" end="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32"/>
+					<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_0EF2D4DC_7ED0_457c_8310_43761AC8295C" start="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" end="EAID_6966846F_842F_4149_A95B_AE374D603608"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" xmi:type="uml:Class" name="epo:TenderAwardOutcome" scope="public">
+				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="2023-06-27 10:58: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="award"/>
 				<attributes>
-					<attribute xmi:idref="EAID_D5E6C297_9C46_4da7_B1B5_F589C83EA61F" name="epo:hasEEAReceivedTenders" scope="Public">
+					<attribute xmi:idref="EAID_8C36560E_7BA5_4caf_9BBC_1CFC01B63943" name="epo:hasAwardRank" scope="Public">
 						<initial/>
-						<documentation value="The amount of tenders received from economic operators in other EEA countries other than the country of the buyer.&#xA;&#xA;WG Approval 12/12/2019"/>
-						<model ea_localid="1783" ea_guid="{D5E6C297-9C46-4da7-B1B5-F589C83EA61F}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="The position of the tender (i.e. whether the tender ended up first, second, third, etc.) in a design contest, some framework agreements with multiple winners (e.g. cascades) or an innovation partnership.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-171 Tender Rank.&#xA;"/>
+						<model ea_localid="1969" ea_guid="{8C36560E-7BA5-4caf-9BBC-1CFC01B63943}"/>
+						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
@@ -21657,28 +22538,71 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_61457F70_4E2E_4945_84FF_A2A3E2C8BCA1" name="epo:hasReceivedParticipationRequests" scope="Public">
-						<initial/>
-						<documentation value="The amount of applications to participate from economic operators.&#xA;&#xA;WG Approval 12/12/2019"/>
-						<model ea_localid="1784" ea_guid="{61457F70-4E2E-4945-84FF-A2A3E2C8BCA1}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="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_DCDCF82F_1D3E_4c68_960A_9BF2F3B08B20" name="epo:hasNonEEAReceivedTenders" scope="Public">
+				</attributes>
+				<links>
+					<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_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
+					<Generalization xmi:id="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
+					<Association xmi:id="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
+				</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_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="award"/>
+				<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_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" 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="award"/>
+				<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_A1BB437B_AD73_4f28_B11F_4B624C467CDA" xmi:type="uml:Package" name="contextual description" scope="public">
+				<model package2="EAID_A1BB437B_AD73_4f28_B11F_4B624C467CDA" package="EAPK_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-28 23:39:31" 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="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="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" xmi:type="uml:Class" name="epo:ConcessionEstimate" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05: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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_31CB3359_8B8C_4be7_9E3D_A338B0A518EE" name="epo:hasCalculationMethod" scope="Public">
 						<initial/>
-						<documentation value="The amount of tenders received from economic operators in non-EEA countries. &#xA;&#xA;WG Approval 12/12/2019 15:20:36"/>
-						<model ea_localid="1786" ea_guid="{DCDCF82F-1D3E-4c68-960A-9BF2F3B08B20}"/>
-						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Formula for obtaining values.&#xA;&#xA;Additional Information:&#xA;The possible values are monetary values, ranking scores, criterion weighting.&#xA;&#xA;WG Approval 25/05/2018"/>
+						<model ea_localid="1849" ea_guid="{31CB3359-8B8C-4be7-9E3D-A338B0A518EE}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21687,18 +22611,372 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_D76A5374_D2FB_4c1d_A657_3AA99D21F66E" name="epo:hasSMEReceivedTenders" scope="Public">
-						<initial/>
-						<documentation value="The amount of tenders received from micro, small and medium-sized enterprises.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;&#xA;See Commission Recommendation 2003/361/EC. &#xA;The ReceivedSMETenderLots is used when the size of the company is not exactly knokn.&#xA;&#xA;WG Approval 05/03/2020&#xA;"/>
-						<model ea_localid="1787" ea_guid="{D76A5374-D2FB-4c1d-A657-3AA99D21F66E}"/>
-						<properties type="xsd:integer" 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;"/>
+				</attributes>
+				<links>
+					<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_91D18452_424C_4f36_8E1E_BF993F4D765A" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" 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"/>
+					<Generalization xmi:id="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
+					<Association xmi:id="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<Association xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" xmi:type="uml:Class" name="epo:ContextDescription" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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 ContextSpecificDescription *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="2023-08-17 16:50: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="contextual description"/>
+				<links>
+					<Generalization xmi:id="EAID_0F0A4585_C0E2_4438_81E0_5F41FAE01E73" start="EAID_C774B4DD_2A7A_4428_BAD6_EEC96CE5E33A" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" start="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" start="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" start="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" start="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD" start="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481" xmi:type="uml:Class" name="epo:ContextualProjection" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-03-12 13:02: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="contextual description"/>
+				<links>
+					<Generalization xmi:id="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
+					<Generalization xmi:id="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" xmi:type="uml:Class" name="epo:ContractLotCompletionInformation" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05:26" 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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_B32A9E0D_605C_457b_A377_9332E2AA545D" name="epo:hasPaymentValueDiscrepancyJustification" scope="Public">
+						<initial/>
+						<documentation/>
+						<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"/>
+						<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_25DE37BE_E478_4159_8F53_7F49CAD18053" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Generalization xmi:id="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" xmi:type="uml:Class" name="epo:Estimate" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-03-12 13:02:33" 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="contextual description"/>
+				<links>
+					<Generalization xmi:id="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" start="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
+					<Generalization xmi:id="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197" start="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_1062E1ED_D094_425e_B51B_9E700090C968" xmi:type="uml:Class" name="epo:ProcurementProcessInformation" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-03-12 13:02:46" 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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_C93F8733_06F6_455d_A6BC_F15A85D13C7F" name="epo:isToBeRelaunched" scope="Public">
+						<initial/>
+						<documentation value="Indicator of whether the procurement object is to be relaunched.&#xA;&#xA;Additional information: &#xA;This can be instantiated in the post award phase. &#xA;&#xA;This corresponds in eForms to BT-634	 Procurement Relaunch.&#xA;&#xA;WG Approval: 18/01/2022&#xA;"/>
+						<model ea_localid="2077" ea_guid="{C93F8733-06F6-455d-A6BC-F15A85D13C7F}"/>
+						<properties type="xsd:boolean" 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_2CF0641F_A4F5_48a8_A318_AD34638C5BB3" name="epo:isCompetitionTerminated" scope="Public">
+						<initial/>
+						<documentation value="No further contracts will be awarded in this procedure.&#xA;&#xA;Additional Information: &#xA;This can be instantiated in the post award phase. &#xA;&#xA;PIN for Competition needs to be signaled. This field can be used even if no contracts are awarded in the contract award notice.&#xA;&#xA;This corresponds in eForms to BT-756 PIN Competition Termination."/>
+						<model ea_localid="2076" ea_guid="{2CF0641F-A4F5-48a8-A318-AD34638C5BB3}"/>
+						<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_7BE6C389_5F20_46db_B56A_257BE240D92C" name="epo:isDPSTerminated" scope="Public">
+						<initial/>
+						<documentation value="End of the Dynamic Purchase System (DPS). &#xA;&#xA;Additional Information: This property can be used in the contract award notice even if no contracts are awarded. &#xA;&#xA;WG Approval 22/11/2019&#xA;"/>
+						<model ea_localid="2088" ea_guid="{7BE6C389-5F20-46db-B56A-257BE240D92C}"/>
+						<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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Generalization xmi:id="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<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_ABA2D6DE_6BD5_49b4_9900_A82C2C734195" start="EAID_1062E1ED_D094_425e_B51B_9E700090C968" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" xmi:type="uml:Class" name="epo:ReviewIrregularitySummary" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05: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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_70D1117D_4D56_407f_AC7F_3F2241342033" name="epo:hasReviewIrregularityCount" scope="Public">
+						<initial/>
+						<documentation value="The number of requests for a given irregularity.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-635 Buyer Review Requests Count."/>
+						<model ea_localid="2019" ea_guid="{70D1117D-4D56-407f-AC7F-3F2241342033}"/>
+						<properties type="xsd:integer" 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>
+					<Generalization xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+					<Dependency xmi:id="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
+					<Association xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" xmi:type="uml:Class" name="epo:ReviewRequestSummary" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05: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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_D66D3445_8E47_4d04_95BC_AFD636549F08" name="epo:hasTotalNumberOfComplainants" scope="Public">
+						<initial/>
+						<documentation value="The number of economic operators that requested 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.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-712	    Buyer Review Complainants&#xA;&#xA;WG Approval 11/04/2019"/>
+						<model ea_localid="1990" ea_guid="{D66D3445-8E47-4d04-95BC-AFD636549F08}"/>
+						<properties type="xsd:integer" 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>
+					<Association xmi:id="EAID_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A"/>
+					<Generalization xmi:id="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+					<Association xmi:id="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" xmi:type="uml:Class" name="epo:StatisticalInformation" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-03-12 13:04:23" 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="contextual description"/>
+				<links>
+					<Generalization xmi:id="EAID_356035E1_7546_4bda_9685_286F5A33ED5A" start="EAID_4F81C811_16F5_4332_BAEA_9843D331872F" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<Generalization xmi:id="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+					<Generalization xmi:id="EAID_3777662E_A9D8_4d59_AF6E_5DFBB174C5FA" start="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+					<Generalization xmi:id="EAID_484BA28E_0C28_4b4b_B440_E1E735697188" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_4F81C811_16F5_4332_BAEA_9843D331872F"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" xmi:type="uml:Class" name="epo:SubcontractingEstimate" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05: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="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_664E6716_07BA_4b02_9D13_99D00FD703DB" 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"/>
+						<model ea_localid="1805" ea_guid="{664E6716-07BA-4b02-9D13-99D00FD703DB}"/>
+						<properties type="rdf:PlainLiteral" 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="*"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_961CE08A_C085_4834_BA34_2B1691E8A7F4" name="epo:hasEstimatedPercentage" scope="Public">
+						<initial/>
+						<documentation value="The estimated proportion foreseen to be subcontracted.&#xA;&#xA;WG Approval 07/01/2020"/>
+						<model ea_localid="1806" ea_guid="{961CE08A-C085-4834-BA34-2B1691E8A7F4}"/>
+						<properties type="xsd:decimal" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_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"/>
+						<model ea_localid="1811" ea_guid="{467A3DAE-DEA8-4237-9133-432198D98388}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" 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;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Generalization xmi:id="EAID_D24BB7D7_DC9F_43ad_AB2C_BEEC4E3BED13" start="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" end="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897"/>
+					<Association xmi:id="EAID_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" xmi:type="uml:Class" name="epo:SubmissionStatisticalInformation" scope="public">
+				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" 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="2023-07-17 17:05: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="contextual description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_D5E6C297_9C46_4da7_B1B5_F589C83EA61F" name="epo:hasEEAReceivedTenders" scope="Public">
+						<initial/>
+						<documentation value="The amount of tenders received from economic operators in other EEA countries other than the country of the buyer.&#xA;&#xA;WG Approval 12/12/2019"/>
+						<model ea_localid="1783" ea_guid="{D5E6C297-9C46-4da7-B1B5-F589C83EA61F}"/>
+						<properties type="xsd:integer" 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_61457F70_4E2E_4945_84FF_A2A3E2C8BCA1" name="epo:hasReceivedParticipationRequests" scope="Public">
+						<initial/>
+						<documentation value="The amount of applications to participate from economic operators.&#xA;&#xA;WG Approval 12/12/2019"/>
+						<model ea_localid="1784" ea_guid="{61457F70-4E2E-4945-84FF-A2A3E2C8BCA1}"/>
+						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="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_DCDCF82F_1D3E_4c68_960A_9BF2F3B08B20" name="epo:hasNonEEAReceivedTenders" scope="Public">
+						<initial/>
+						<documentation value="The amount of tenders received from economic operators in non-EEA countries. &#xA;&#xA;WG Approval 12/12/2019 15:20:36"/>
+						<model ea_localid="1786" ea_guid="{DCDCF82F-1D3E-4c68-960A-9BF2F3B08B20}"/>
+						<properties type="xsd:integer" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;union=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_D76A5374_D2FB_4c1d_A657_3AA99D21F66E" name="epo:hasSMEReceivedTenders" scope="Public">
+						<initial/>
+						<documentation value="The amount of tenders received from micro, small and medium-sized enterprises.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;&#xA;See Commission Recommendation 2003/361/EC. &#xA;The ReceivedSMETenderLots is used when the size of the company is not exactly knokn.&#xA;&#xA;WG Approval 05/03/2020&#xA;"/>
+						<model ea_localid="1787" ea_guid="{D76A5374-D2FB-4c1d-A657-3AA99D21F66E}"/>
+						<properties type="xsd:integer" 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>
@@ -21906,21 +23184,35 @@
 					<Association xmi:id="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95" start="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" xmi:type="uml:Class" name="epo:SubmissionTerm" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:37" complexity="1" status="Proposed"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-26 15:55: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="eProcurementOntology"/>
+				<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"/>
+			</element>
+			<element xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" xmi:type="uml:Class" name="epo:Document" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:04: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"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<attributes>
-					<attribute xmi:idref="EAID_25B4DC5C_87DD_4edb_867A_D36061C7C85B" name="epo:hasEAuctionURL" scope="Public">
+					<attribute xmi:idref="EAID_51F37B13_01DA_4da5_8782_30A2D193D4B4" name="dct:title" scope="Public">
 						<initial/>
-						<documentation value="The internet address of the electronic auction.&#xA;&#xA;Additional Information:&#xA;&#xA;This corresponds in eForms to BT-123	    Electronic Auction URL."/>
-						<model ea_localid="2052" ea_guid="{25B4DC5C-87DD-4edb-867A-D36061C7C85B}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;&#xA;"/>
+						<model ea_localid="2068" ea_guid="{51F37B13-01DA-4da5-8782-30A2D193D4B4}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
@@ -21931,13 +23223,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_B8F4E8C3_3C6E_4b8a_9E44_F51D72FE840E" name="epo:hasReceiptDeadline" scope="Public">
+					<attribute xmi:idref="EAID_51725CA6_C5F4_4f21_9EF1_1A912A3B0BB5" name="epo:hasPublicationDate" scope="Public">
 						<initial/>
-						<documentation value="The time limit for receiving submissions.&#xA;&#xA;Additional Information&#xA;This is the  deadline by which the buyer must receive submissions (e.g. tenders, requests to participate, clarifications, etc.) and is not the time at which the information is submitted by the economic operator.&#xA;This attribute should be used for standard forms mappings.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
-						<model ea_localid="1816" ea_guid="{B8F4E8C3-3C6E-4b8a-9E44-F51D72FE840E}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Date of formal public issuance of the document.&#xA;&#xA;WG approval 20/06/2023"/>
+						<model ea_localid="1685" ea_guid="{51725CA6-C5F4-4f21-9EF1-1A912A3B0BB5}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21946,13 +23238,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C009AB79_D7C1_4fc1_B974_73482723AB30" name="epo:hasReceiptExpressionDeadline" scope="Public">
+					<attribute xmi:idref="EAID_3937FE75_CD7A_4066_8A4A_E58D6D3A45F9" name="epo:hasReceptionDate" scope="Public">
 						<initial/>
-						<documentation value="Time limit for receipt of expressions of interest.&#xA;&#xA;Pending of review by the WG&#xA;&#xA;"/>
-						<model ea_localid="1738" ea_guid="{C009AB79-D7C1-4fc1-B974-73482723AB30}"/>
-						<properties type="xsd:dateTime" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Notes:	Date when a record is acknowledged by an organisation.&#xA;&#xA;WG Approval 12/05/2020"/>
+						<model ea_localid="1617" ea_guid="{3937FE75-CD7A-4066-8A4A-E58D6D3A45F9}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21961,13 +23253,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_0A093F33_1E8D_431b_B4A7_BC3DD1D88947" name="epo:isGuaranteeRequired" scope="Public">
+					<attribute xmi:idref="EAID_61F89B7E_E919_4ed9_8E59_56E7A1D1DF02" name="epo:hasDispatchDate" scope="Public">
 						<initial/>
-						<documentation value="The submitted information must include a financial commitment to be used in case of default.&#xA;&#xA;Additional Information:&#xA;See the additional information provided in  the definition of the 'Guarantee Description' element.&#xA;&#xA;WG Approval 21/07/20&#xA;&#xA;"/>
-						<model ea_localid="1818" ea_guid="{0A093F33-1E8D-431b-B4A7-BC3DD1D88947}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Date and time of transmission of a record to an Organization.&#xA;&#xA;WG Approval 31/08/2023"/>
+						<model ea_localid="1618" ea_guid="{61F89B7E-E919-4ed9-8E59-56E7A1D1DF02}"/>
+						<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"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -21976,43 +23268,43 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_7FAFE0A0_6346_40b8_8467_BD3EAA918250" name="epo:hasGuaranteeDescription" scope="Public">
+					<attribute xmi:idref="EAID_BDAC9D0C_7361_4b50_A424_99670D546E07" name="dct:issued" scope="Public">
 						<initial/>
-						<documentation value="Information on the financial commitment required from the economic operator. &#xA;&#xA;Additional Information:&#xA;1.  This information may include the amount and the way of delivering of the guarantee&#xA;2. The financial commitment may be retained by the buyer in the case the tenderer withdraws the submitted information (i.e. tender, expression of interest and request for participation, but not request for clarifications) before the award of the contract or does not sign the contract.&#xA;3. Usual modalities are bonds, cheques, loans, other.&#xA;&#xA;WG Approval 21/07/20&#xA;"/>
-						<model ea_localid="1819" ea_guid="{7FAFE0A0-6346-40b8-8467-BD3EAA918250}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<documentation value="Date of formal issuance of the resource.&#xA;&#xA;Additional information: &#xA;This is generally used for modules other than eNotice.&#xA;The xsd:dateTime here means that we can provide either xsd:date, xsd:dateTime, or xsd:timeStamp or any other variant of time expression. This extension needs to be encoded/automated in the ontology and in the application profile. &#xA;Why is it like this? Because UML cannot handle such expressions of disjunctive property ranges.&#xA;&#xA;WG approval 26/01/2023"/>
+						<model ea_localid="2235" ea_guid="{BDAC9D0C-7361-4b50-A424-99670D546E07}"/>
+						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
 						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_0A0C8C8F_481F_4e16_B636_E9A45391BA3E" name="epo:hasSubmissionURL" scope="Public">
+					<attribute xmi:idref="EAID_BB755B85_3387_4afc_904E_98634DCB59F5" name="dct:description" scope="Public">
 						<initial/>
-						<documentation value="&#xA;Additional Information:&#xA;This corresponds to the eForms BT-18	    Submission URL.&#xA;&#xA;This corresponds in eForms to BT-509	Organisation eDelivery Gateway."/>
-						<model ea_localid="2051" ea_guid="{0A0C8C8F-481F-4e16-B636-E9A45391BA3E}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="2327" ea_guid="{BB755B85-3387-4afc-904E-98634DCB59F5}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_5940AFF6_EDC8_41c1_A493_F3DF27FB67C5" name="epo:hasNonElectronicSubmissionDescription" scope="Public">
+					<attribute xmi:idref="EAID_F6220AE8_8F3D_4028_9A5B_A927863C6D72" name="epo:hasAccessURL" scope="Public">
 						<initial/>
-						<documentation value="Textual explanation of how non-electronic information is to be presented.&#xA;&#xA;WG Approval 21/07/2020&#xA;&#xA;"/>
-						<model ea_localid="1822" ea_guid="{5940AFF6-EDC8-41c1-A493-F3DF27FB67C5}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="8"/>
+						<documentation value="Location where the resource can be accessed. &#xA;&#xA;WG approval 07/04/2022"/>
+						<model ea_localid="2028" ea_guid="{F6220AE8-8F3D-4028-9A5B-A927863C6D72}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -22021,28 +23313,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_FE9E9688_0EC4_4a22_8340_EA2FAF94B78F" name="epo:hasReceiptPreliminaryMarketConsultationDeadline" scope="Public">
+					<attribute xmi:idref="EAID_94717B46_992B_4a90_B977_87F24DE80620" name="epo:hasVersion" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2404" ea_guid="{FE9E9688-0EC4-4a22-8340-EA2FAF94B78F}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A number that identifies a specific state of a document.&#xA;&#xA;WG approval: 18/11/2021&#xA;"/>
+						<model ea_localid="1934" ea_guid="{94717B46-992B-4a90-B977-87F24DE80620}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="10"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_DDA42505_C694_419c_B5A3_DCF52C96BA83" name="epo:isAdvancedElectronicSignatureRequired" scope="Public">
-						<initial/>
-						<documentation value="Advanced or qualified electronic signature or seal (as defined in Regulation (EU) No 910/2014) is required.&#xA;&#xA;&#xA;&#xA;The submitted information is required to be signed electronically.&#xA;&#xA;Additional Information: &#xA;&#xA;Signature can be defined as &quot;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;For more details on the meaning and uses of electronic signature you may consult different authoritative sources, a relevant one being for instance the Regulation (EU) 910/2014 on electronic identification and trust services for electronic transactions in the internal market.&#xA;&#xA;WG Approval 21/07/2020&#xA;"/>
-						<model ea_localid="1824" ea_guid="{DDA42505-C694-419c-B5A3-DCF52C96BA83}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="10"/>
+						<containment containment="Not Specified" position="7"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22051,43 +23328,111 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_B48EEE40_ED5C_48cf_AFC4_3D5FB5EE6906" name="epo:hasReceiptParticipationRequestDeadline" scope="Public">
+				</attributes>
+				<links>
+					<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_39F3583F_0D40_4e9f_8018_10297955785C" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
+					<Association xmi:id="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Dependency xmi:id="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
+					<Association xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124"/>
+					<Association xmi:id="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" start="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_39F3583F_0D40_4e9f_8018_10297955785C" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" start="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_4E94CD77_EB61_4a9e_A6A4_14096262384A" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4" start="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" start="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" start="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84" start="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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_DFE11A54_45B0_449d_B8FF_34E21440DAD9" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" start="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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_4AE23ED9_1639_41e0_A758_C201E2EDE124" xmi:type="uml:Class" name="epo:ElectronicSignature" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-04-04 16:57: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="document"/>
+				<attributes>
+					<attribute xmi:idref="EAID_549AA19E_CB40_4af8_BF5C_1CBDD82A3E31" name="dct:description" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2405" ea_guid="{B48EEE40-ED5C-48cf-AFC4-3D5FB5EE6906}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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"/>
+						<model ea_localid="2350" ea_guid="{549AA19E-CB40-4af8-BF5C-1CBDD82A3E31}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="11"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_80AFF8F1_AF96_4e09_801D_A796A1DC3D1C" name="epo:isMultipleTenderSubmissionAllowed" scope="Public">
-						<initial/>
-						<documentation value="Tenderers may submit more than one competing tenders.&#xA;&#xA;WG Approval 10/10/2019&#xA;&#xA;"/>
-						<model ea_localid="1825" ea_guid="{80AFF8F1-AF96-4e09-801D-A796A1DC3D1C}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="11"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
+				</attributes>
+				<links>
+					<Association xmi:id="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0" start="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" end="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" xmi:type="uml:Class" name="epo:ExpressionOfInterest" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:08: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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="document"/>
+				<links>
+					<Generalization xmi:id="EAID_DCD1791D_6597_41ef_AB35_766470760473" start="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" xmi:type="uml:Class" name="epo:Notice" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-13 10:01:27" 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="document"/>
+				<attributes>
+					<attribute xmi:idref="EAID_1264386A_C67E_4009_888E_552A62DE7225" name="epo:hasOJSIssueNumber" scope="Public">
+						<initial/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C91BA594_4948_4ee3_BA84_B73B538B8AC5" name="epo:hasReceiptTenderDeadline" scope="Public">
+					<attribute xmi:idref="EAID_2BBC248F_0AEE_4e3f_B002_536AFCD78D28" name="epo:hasOJSType" scope="Public">
 						<initial/>
 						<documentation/>
-						<model ea_localid="2406" ea_guid="{C91BA594-4948-4ee3-BA84-B73B538B8AC5}"/>
-						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<model ea_localid="2354" ea_guid="{2BBC248F-0AEE-4e3f-B002-536AFCD78D28}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="12"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22096,147 +23441,73 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_64609019_E492_413d_B12C_46646DE65A2D" name="epo:hasLateSubmissionInformationDescription" scope="Public">
+					<attribute xmi:idref="EAID_AC36AFF2_4288_4e0c_8944_0179AA352784" name="epo:hasNoticePublicationNumber" scope="Public">
 						<initial/>
-						<documentation value="A narrative text explaining the content of the economic operator information that can be submitted late.&#xA;&#xA;Additional Information&#xA;This does not apply to requests for clarifications.&#xA;"/>
-						<model ea_localid="1828" ea_guid="{64609019-E492-413d-B12C-46646DE65A2D}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="14"/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Generalization xmi:id="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Dependency xmi:id="EAID_6D0203DA_A8A3_482a_B747_66A09DEF42FC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521"/>
-					<Association xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B"/>
-					<Dependency xmi:id="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1FF5173E_4940_44db_A1A0_C190337F6440"/>
-					<Dependency xmi:id="EAID_8CA66645_D223_487b_B348_21446E4664A6" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
-					<Generalization xmi:id="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940"/>
-					<Dependency xmi:id="EAID_9B46D9F5_E71D_40fc_A50D_BE4367D5EE4E" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
-					<Association xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2"/>
-					<Dependency xmi:id="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E"/>
-					<Dependency xmi:id="EAID_C325A5AA_AAE1_4e55_A542_A867A1BED99D" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
-					<Association xmi:id="EAID_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432"/>
-					<Dependency xmi:id="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" xmi:type="uml:Class" name="epo:System" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_5CCFF70B_5C0F_4b3c_8D5E_F1C29EFEBB48" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_41B830AF_AE4D_4902_8134_A119102AB4ED" name="epo:hasFormNumber" 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"/>
-						<model ea_localid="1830" ea_guid="{5CCFF70B-5C0F-4b3c-8D5E-F1C29EFEBB48}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation/>
+						<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"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Generalization xmi:id="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Association xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" xmi:type="uml:Class" name="epo:TaxInformationProvider" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<links>
-					<Generalization xmi:id="EAID_0F5296C9_3949_4cbc_913E_EAEE25BEEAD8" start="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" end="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" xmi:type="uml:Class" name="epo:TechnicalAbilitySummary" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:05" 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_829CE86D_DCFB_48b2_AA55_2065496F072C" start="EAID_FB996CB7_0FB9_4a30_8AA0_0ABAC3D0F2BD" end="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_3780AA50_D898_4068_B300_47B46651CA0A" xmi:type="uml:Class" name="epo:Technique" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22: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/>
-				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_72399903_AD44_401f_A23C_F48405982480" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_D6C37FAA_411E_4ea1_9106_C6437D14FC89" name="epo:hasEFormsSubtype" 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"/>
-						<model ea_localid="1834" ea_guid="{72399903-AD44-401f-A23C-F48405982480}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation/>
+						<model ea_localid="2358" ea_guid="{D6C37FAA-411E-4ea1-9106-C6437D14FC89}"/>
+						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="volatile=0;"/>
+						<tags/>
+						<xrefs/>
+					</attribute>
+					<attribute xmi:idref="EAID_3F661AC2_73BE_4fb2_9DEF_E733091C3271" 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="2403" ea_guid="{3F661AC2-73BE-4fb2-9DEF-E733091C3271}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="7"/>
+						<stereotype/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-				</attributes>
-				<links>
-					<Dependency xmi:id="EAID_8FF77444_1F49_4895_AA8E_5C76444F3AE1" start="EAID_3780AA50_D898_4068_B300_47B46651CA0A" end="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3"/>
-					<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_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Generalization xmi:id="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" start="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Association xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Generalization xmi:id="EAID_D1D7983F_8387_4c3b_9950_CE4378AD01B0" start="EAID_D2862D88_92C5_4206_B142_36CDBA0095B8" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Generalization xmi:id="EAID_E41E06F2_CE80_425f_996C_08130A9CC404" start="EAID_7D8A2312_4686_49e6_B174_97BCF34F4CE4" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-				</links>
-			</element>
-			<element xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" xmi:type="uml:Class" name="epo:TenderAwardOutcome" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:32" 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_8C36560E_7BA5_4caf_9BBC_1CFC01B63943" name="epo:hasAwardRank" scope="Public">
+					<attribute xmi:idref="EAID_9517771D_AF11_41cd_BB0D_294796B07624" name="epo:hasESenderDispatchDate" scope="Public">
 						<initial/>
-						<documentation value="The position of the tender (i.e. whether the tender ended up first, second, third, etc.) in a design contest, some framework agreements with multiple winners (e.g. cascades) or an innovation partnership.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-171 Tender Rank.&#xA;"/>
-						<model ea_localid="1969" ea_guid="{8C36560E-7BA5-4caf-9BBC-1CFC01B63943}"/>
-						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date and time the notice was transmitted electronically by the eSender to the Publications Office of the European Union.&#xA;&#xA;Additional Information:&#xA;Typically, eSenders include national Official Journals, Buyers sending a large number of electronic Notices, public or private bodies acting on behalf of Buyers and eProcurement software developers.&#xA;&#xA;WG approval 20/06/2023"/>
+						<model ea_localid="2427" ea_guid="{9517771D-AF11-41cd-BB0D-294796B07624}"/>
+						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="0"/>
+						<containment containment="Not Specified" position="8"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22247,91 +23518,116 @@
 					</attribute>
 				</attributes>
 				<links>
-					<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_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
-					<Generalization xmi:id="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481"/>
-					<Association xmi:id="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403" start="EAID_E7437025_771F_4143_BE33_620A29646687" end="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B"/>
+					<Association xmi:id="EAID_20B9978D_8D66_48ab_B3C3_6654ABB348DF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Dependency xmi:id="EAID_3561E9C9_899A_4ca7_9CF4_9285C5C0CCEC" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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"/>
+					<Dependency xmi:id="EAID_6AA5ADDC_B303_41f6_A0B5_482CD2D1D30D" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_C07688A9_AAC8_4f60_A2CC_FA90C006C282"/>
+					<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_A6577BAD_B1CB_4608_94A0_32241C0F50CE" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Dependency xmi:id="EAID_F337974A_F4B7_4be6_BD98_F885B35FD24B" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A"/>
+					<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_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"/>
+					<Association xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<Association xmi:id="EAID_D3DD6F7E_CC4D_4861_963A_7FE0F57DA5D8" start="EAID_04D934CA_1928_476f_BE9C_C9CD1456AEBB" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" xmi:type="uml:Class" name="epo:Tenderer" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:19" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" xmi:type="uml:Class" name="epo:Offer" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:10: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="classes"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<links>
-					<Generalization xmi:id="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<Association xmi:id="EAID_3EE4B991_B9E8_4e17_87D7_D2C5E8C7FFF8" start="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" end="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90"/>
-					<Association xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
-					<Association xmi:id="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
+					<Generalization xmi:id="EAID_43A3B220_8C42_4627_B845_A73F67127C06" start="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_10FDE910_8BBC_40cf_9554_B5D06E8DEBAA" start="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
+					<Association xmi:id="EAID_B44261EC_B8C1_4e5a_9174_C3DEEEA32848" start="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
+					<Generalization xmi:id="EAID_D4216826_2B82_4f98_BB11_ACD4AFBD9119" start="EAID_640F316F_44B1_44a6_9B37_FD17A852946F" end="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" xmi:type="uml:Class" name="epo:TenderProcessor" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:19" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" xmi:type="uml:Class" name="epo:OriginatorRequest" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-02-09 16:22:32" 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"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<links>
-					<Generalization xmi:id="EAID_D7F9D64F_889F_4301_9BA8_05D6512C15C2" start="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_BC7F270C_1A4E_400c_88ED_7EFEB868C4EC" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2"/>
+					<Generalization xmi:id="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" start="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_976D38A5_94EF_4bae_941E_311C9FC4668A" start="EAID_D862AE4B_9219_4f8e_9EF6_4DA5A1D61809" end="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" xmi:type="uml:Class" name="epo:TenderReceiver" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:19" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" xmi:type="uml:Class" name="epo:ProcurementDocument" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:13: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="document"/>
+				<links>
+					<Generalization xmi:id="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" start="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
+					<Generalization xmi:id="EAID_A00448A7_8270_497c_9895_20BF2C6316EF" start="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1" end="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" xmi:type="uml:Class" name="epo:RequestForClarification" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:13: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="classes"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<links>
-					<Generalization xmi:id="EAID_7D4F2A49_092C_4524_8A97_BB99CF182780" start="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" end="EAID_BCFFD008_5189_4d53_B61A_99942ED53255"/>
-					<Association xmi:id="EAID_7BC31FFB_F53F_431c_AED5_36E1786ED85F" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B"/>
+					<Generalization xmi:id="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" start="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" xmi:type="uml:Class" name="epo:Term" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:12" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" xmi:type="uml:Class" name="epo:RequestForParticipation" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-03-12 13:14:20" 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"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<links>
-					<Generalization xmi:id="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" start="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Generalization xmi:id="EAID_285BF543_AB60_4346_9E70_090B7DE95623" start="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Association xmi:id="EAID_818697AF_821C_40da_B5DE_D7ED82169378" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<NoteLink xmi:id="EAID_A521BACC_3593_49bc_AB31_246F04F34435" start="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Generalization xmi:id="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" start="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Generalization xmi:id="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" start="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
+					<Generalization xmi:id="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" start="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" xmi:type="uml:Class" name="epo:VehicleInformation" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:16" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" xmi:type="uml:Class" name="epo:AwardDecision" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-06-26 15:14: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/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
+				<extendedProperties tagged="0" package_name="document"/>
 				<attributes>
-					<attribute xmi:idref="EAID_5B166BB3_0A29_4594_97B0_16D705A9F927" name="epo:hasTotalVehicles" scope="Public">
+					<attribute xmi:idref="EAID_056A68FB_CC31_4937_8CD8_3FFE6692677E" name="epo:hasAwardDecisionDate" 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;"/>
-						<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"/>
-						<containment containment="Not Specified" position="13"/>
+						<documentation value="The official date of the award decision.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-1451 Winner Decision Date.&#xA;&#xA;WG Approval 09/01/2020&#xA;"/>
+						<model ea_localid="1970" ea_guid="{056A68FB-CC31-4937-8CD8-3FFE6692677E}"/>
+						<properties type="xsd:dateTime" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22340,13 +23636,49 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_79CEE53B_719C_42c2_8AE2_8FB4C6159B75" name="epo:hasZeroEmissionVehicles" scope="Public">
+					<attribute xmi:idref="EAID_BE5D6D69_56E5_4540_9E6C_9ECA9C74AD61" name="epo:hasAdditionalNonAwardJustification" 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;"/>
-						<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"/>
+						<documentation value="Further justification for the non award .&#xA;&#xA;Additional information: &#xA;This is generally used when the non award reason code is set to &quot;Other&quot;.&#xA;&#xA;WG: 18/01/2022"/>
+						<model ea_localid="1972" ea_guid="{BE5D6D69-56E5-4540-9E6C-9ECA9C74AD61}"/>
+						<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>
+					<Generalization xmi:id="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Association xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
+					<Association xmi:id="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<Association xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<Association xmi:id="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<Association xmi:id="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<Association xmi:id="EAID_EBAA0FEE_B552_4003_8B98_ADD4600E7BA1" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" xmi:type="uml:Class" name="epo:Tender" scope="public">
+				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" 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="2023-06-20 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/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="document"/>
+				<attributes>
+					<attribute xmi:idref="EAID_497AFB0F_4C0A_478a_ABA1_C730072CAB97" name="epo:hasElectronicSubmission" scope="Public">
+						<initial/>
+						<documentation value="Transmission of tenders is possible by electronic means of communication. "/>
+						<model ea_localid="1836" ea_guid="{497AFB0F-4C0A-478a-ABA1-C730072CAB97}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="16"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22355,13 +23687,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9437602D_8F8F_47f4_A458_A53DAE08FDF0" name="epo:hasCleanVehicles" scope="Public">
+					<attribute xmi:idref="EAID_089130B8_3D63_4690_82F1_B357630F3194" name="epo:isVariant" 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;"/>
-						<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"/>
+						<documentation value="Alternative solution to fulfil the buyer's needs as opposed to solutions indicated in the procurement documents.&#xA;&#xA;Additional Information:&#xA;&#xA;The permission to offer variants is only allowed if specified in a Contract Notice or a Prior Information Notice that used as a means for calling for a competition.&#xA;The buyer lays out minimum requirements in the procurement documents that must be respected by tenderers submitting variants.&#xA;&#xA;WG Approval 29/05/2019&#xA;&#xA;"/>
+						<model ea_localid="1841" ea_guid="{089130B8-3D63-4690-82F1-B357630F3194}"/>
+						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="17"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22372,61 +23704,85 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4"/>
-					<Dependency xmi:id="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_F565346A_74A1_4bf9_82F9_EE632CBBD88D"/>
-					<Dependency xmi:id="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" start="EAID_6ECEAFA7_64BC_4bb7_B6A9_172F178688C0" end="EAID_63483BB6_C796_4631_87DA_3F3808C4744F"/>
+					<Association xmi:id="EAID_131426FE_407B_41cc_8545_0E43CC2AD3BA" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_640F316F_44B1_44a6_9B37_FD17A852946F"/>
+					<Dependency xmi:id="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82"/>
+					<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_47C8CD49_71D8_4ef9_919E_87DD36154F85" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
+					<Association xmi:id="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Dependency xmi:id="EAID_73E0123E_9D07_49c6_BAB3_E937B9F25B43" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
+					<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_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
+					<Generalization xmi:id="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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_F039FB34_0EE7_4244_8378_D6711720B09B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198"/>
+					<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_56C62F68_CA40_4dde_B4CE_1CC777975EF3" xmi:type="uml:Class" name="epo:Winner" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:20:19" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" xmi:type="uml:Package" name="contract" scope="public">
+				<model package2="EAID_94194397_D26C_4972_AE3E_34F5B925DA64" package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="1" ea_localid="139" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-03-29 16:05:23" modified="2023-06-20 11:33: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="document"/>
+				<packageproperties version="1.0" tpos="1"/>
+				<paths/>
+				<times created="2022-03-29 16:05:23" modified="2022-03-29 16:05:23"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" xmi:type="uml:Class" name="epo:ConcessionContract" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-03-12 11:37: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="classes"/>
+				<extendedProperties tagged="0" package_name="contract"/>
 				<links>
-					<Association xmi:id="EAID_61636EE3_DE81_4083_BF9B_6F607A63A921" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53"/>
-					<Generalization xmi:id="EAID_E4D55FF7_2180_4a21_A34C_23F9AB59E814" start="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" end="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985"/>
-					<Association xmi:id="EAID_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" start="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
-					<Association xmi:id="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" start="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" end="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3"/>
+					<Generalization xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" start="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" xmi:type="uml:Class" name="foaf:Agent" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" xmi:type="uml:Class" name="epo:Contract" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-07-13 07:29: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"/>
+				<extendedProperties tagged="0" package_name="contract"/>
 				<attributes>
-					<attribute xmi:idref="EAID_B904599A_7FDD_4e84_BE6E_9839EB3B7763" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_BC34978E_EE66_4466_B876_2648A2FCB695" name="epo:hasContractConclusionDate" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
-						<model ea_localid="1831" ea_guid="{B904599A-7FDD-4e84-BE6E-9839EB3B7763}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date the contract was signed by the last signatory party.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;In exceptional cases contracts may be concluded without signature and therefore another date may be used. The date of contract conclusion is always later than the end of any standstill period.&#xA;This concept is not to be confused with the date of completion/end of the contract.&#xA;&#xA;This corresponds in eForms to BT-145	        Contract Conclusion Date.&#xA;&#xA;WG Approval 09/01/2020"/>
+						<model ea_localid="1590" ea_guid="{BC34978E-EE66-4466-B876-2648A2FCB695}"/>
+						<properties type="xsd:date" derived="0" collection="false" length="0" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_246B4CD5_545D_40e6_BC72_AB7858D869B1" name="epo:hasAlias" scope="Public">
+					<attribute xmi:idref="EAID_E871E926_FF03_40dc_B883_35A17CF5DA90" name="epo:hasEntryIntoForceDate" scope="Public">
 						<initial/>
-						<documentation value="Acronym or alternative name of the Agent.&#xA;WG Approval 25/03/2021"/>
-						<model ea_localid="1545" ea_guid="{246B4CD5-545D-40e6-BC72-AB7858D869B1}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date on which the contract enters into force.&#xA;&#xA;Additional information: &#xA;&#xA;This is generally the date on which the fulfillment of the contract begins.&#xA;&#xA;This corresponds in eForms to &#xA;&#xA;WG approval 05/11/2019"/>
+						<model ea_localid="1591" ea_guid="{E871E926-FF03-40dc-B883-35A17CF5DA90}"/>
+						<properties type="xsd:date" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
 						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -22435,48 +23791,82 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_319F106B_6066_4ba7_B084_12D7110FE9E0" start="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Generalization xmi:id="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Association xmi:id="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Generalization xmi:id="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Generalization xmi:id="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Association xmi:id="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E" start="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
+					<Association xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<Association xmi:id="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31"/>
+					<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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
+					<Association xmi:id="EAID_3EC00346_DC8E_4fd4_8A9A_9A4173CBD283" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
+					<Association xmi:id="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
+					<Generalization xmi:id="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<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_DDBC2835_CD1A_40df_9C2D_9222DAB14E19" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
+					<Association xmi:id="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7"/>
+					<Association xmi:id="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_811D4703_55F7_4d6e_B8D8_207479C15419"/>
+					<Association xmi:id="EAID_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_BE2F0699_0589_4cbc_B1E8_3925D69F40D4"/>
+					<Association xmi:id="EAID_FD687C05_7D35_48ab_B0AA_8C6787D5DF46" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
+					<Association xmi:id="EAID_1326915C_1564_403a_A96E_65DCEC3F641A" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053" start="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<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"/>
+					<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"/>
+					<Association xmi:id="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A" start="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Generalization xmi:id="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E" start="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Generalization xmi:id="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB" start="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12" start="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" xmi:type="uml:Class" name="foaf:Person" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" xmi:type="uml:Class" name="epo:DirectContract" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-05-24 13:13: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="classes"/>
+				<extendedProperties tagged="0" package_name="contract"/>
 				<links>
-					<Generalization xmi:id="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Association xmi:id="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" start="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-					<Association xmi:id="EAID_3F693B40_13CE_47d1_A051_E627959E09EF" start="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-					<Association xmi:id="EAID_E3D7352D_80E6_41e6_B85A_672AACE795E2" start="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
-					<Generalization xmi:id="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53"/>
+					<Association xmi:id="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<Generalization xmi:id="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46" start="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_29678A10_6473_461a_BE84_76269B5BBD68" xmi:type="uml:Class" name="locn:Address" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:04" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" xmi:type="uml:Class" name="epo:FrameworkAgreement" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-05-10 12:44: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"/>
+				<extendedProperties tagged="0" package_name="contract"/>
+				<links>
+					<Association xmi:id="EAID_A96B5FDE_85B9_4435_B7E7_D176E6996280" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A"/>
+					<Generalization xmi:id="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" start="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029" end="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066"/>
+					<Association xmi:id="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" xmi:type="uml:Class" name="epo:Fund" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-03-12 11:41: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="contract"/>
 				<attributes>
-					<attribute xmi:idref="EAID_03D8D24B_9666_44c8_AE46_FDF98BE48098" name="locn:postName" scope="Public">
+					<attribute xmi:idref="EAID_98A72BB3_DF5F_4be0_AF69_D4FBC1D44760" name="dct:title" scope="Public">
 						<initial/>
-						<documentation value="The key postal division of the address, usually the city. (INSPIRE's definition is &quot;One or more names created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.) For example, &quot;Paris&quot;."/>
-						<model ea_localid="1525" ea_guid="{03D8D24B-9666-44c8-AE46-FDF98BE48098}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023&#xA;"/>
+						<model ea_localid="1653" ea_guid="{98A72BB3-DF5F-4be0-AF69-D4FBC1D44760}"/>
+						<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"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -22485,43 +23875,28 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_5D5F6583_5ACA_48be_9C44_DEB260EE3AB7" name="locn:addressArea" scope="Public">
-						<initial/>
-						<documentation value="The name or names of a geographic area or locality that groups a number of addressable objects for addressing purposes, without being an administrative unit.&#xA;&#xA;Additional Information:&#xA;This would typically be part of a city, a neighbourhood or village, e.g. Montmartre."/>
-						<model ea_localid="1982" ea_guid="{5D5F6583-5ACA-48be-9C44-DEB260EE3AB7}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_70E756E5_00B9_4f66_9D4B_3409713C111D" name="locn:locatorName" scope="Public">
+					<attribute xmi:idref="EAID_A8703CC7_1B7A_459a_86B8_A6AD56C43AA1" name="dct:description" scope="Public">
 						<initial/>
-						<documentation value="Proper noun(s) applied to the real world entity identified by the locator.&#xA;&#xA;Additional Information:&#xA;The locator name could be the name of the property or complex, of the building or part of the building, or it could be the name of a room inside a building.&#xA;&#xA;The key difference between a locator and a locator name is that the latter is a proper name and is unlikely to include digits. For example, &quot;Shumann, Berlaymont&quot; is a meeting room within the European Commission headquarters for which locator name is more appropriate than locator."/>
-						<model ea_localid="1979" ea_guid="{70E756E5-00B9-4f66-9D4B-3409713C111D}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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"/>
+						<model ea_localid="2061" ea_guid="{A8703CC7-1B7A-459a-86B8-A6AD56C43AA1}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_802D9A52_073D_455b_A0F6_DB8FE24D4365" name="locn:adminUnitL2" scope="Public">
+					<attribute xmi:idref="EAID_1FBFD12B_B5EB_429a_B2C2_846F2F33BCEE" name="epo:hasURL" scope="Public">
 						<initial/>
-						<documentation value="The name or names of a unit of administration related to the exercise of jurisdictional rights, for local, regional and national governance. Level 2 refers to the region of the address, usually a county, state or other such area that typically encompasses several localities.&#xA;&#xA;Additional Information:&#xA;Some recommended codelists from the EU Publications Office include: Administrative Territorial Units (ATU), NUTS and Local Administrative Units (LAU). The first arrondissement of Paris is for example expressed as &quot;http://publications.europa.eu/resource/authority/atu/FRA_AR_PAR01&quot; in the ATU controlled vocabulary.&#xA;"/>
-						<model ea_localid="2091" ea_guid="{802D9A52-073D-455b-A0F6-DB8FE24D4365}"/>
-						<properties type="rdf:langString" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<documentation value="The identifier of a resource.&#xA;&#xA;Additional Information&#xA;&#xA;For example:&#xA;&#xA;1. The URL of the system from where to access the procurement documents;&#xA;2. The URL of the system for the submission of tender documents;&#xA;3. The URL of the system from where to download a tool to communicate with the Buyer;&#xA;4. The URL of the system used by a Technique to allow Economic Operators to exchange information with the Buyer (e.g. eAuction and DPS Systems)&#xA;5. The URL of the system used to exchange information between Buyer and EO for questions and clarifications;&#xA;&#xA;WG Approval 30/09/2019"/>
+						<model ea_localid="1654" ea_guid="{1FBFD12B-B5EB-429a-B2C2-846F2F33BCEE}"/>
+						<properties type="xsd:anyURI" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22530,43 +23905,60 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_829CA5E1_0FDA_4c48_8F2E_DB19DABE380D" name="locn:fullAddress" scope="Public">
-						<initial/>
-						<documentation value="The complete address written as a formatted string.&#xA;&#xA;Additional Information:&#xA;Use of this property is recommended as it will not suffer any misunderstandings that might arise through the breaking up of an address into its component parts. This property is analogous to vCard's label property but with two important differences: (1) formatting is not assumed so that, unlike vCard label, it may not be suitable to print this on an address label, (2) vCard's label property has a domain of vCard Address; the fullAddress property has no such restriction. An example of a full address is &quot;Champ de Mars, 5 Avenue Anatole France, 75007 Paris, France&quot;."/>
-						<model ea_localid="1980" ea_guid="{829CA5E1-0FDA-4c48-8F2E-DB19DABE380D}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_26BA9E10_DECA_4349_A6FE_21031DBF9E64" name="locn:locatorDesignator" scope="Public">
-						<initial/>
-						<documentation value="A number or a sequence of characters which allows a user or an application to interpret, parse and format the locator within the relevant scope. A locator may include more locator designators.&#xA;&#xA;Additional Information:&#xA;In simpler terms, this is the building number, apartment number, etc. For an address such as &quot;Flat 3, 17 Bridge Street&quot;, the locator is &quot;flat 3, 17&quot;."/>
-						<model ea_localid="1981" ea_guid="{26BA9E10-DECA-4349-A6FE-21031DBF9E64}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="7"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_79C9C8AE_515F_4e62_A7A2_8994B97F40FC" name="locn:adminUnitL1" scope="Public">
+				</attributes>
+				<links>
+					<Dependency xmi:id="EAID_3C2D8165_83BF_498f_B03B_E256F94C76B5" start="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" end="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C"/>
+					<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_0F625CFF_139F_4712_8BB6_681888ACB178" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
+					<Association xmi:id="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
+				</links>
+			</element>
+			<element xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" xmi:type="uml:Class" name="epo:PurchaseContract" scope="public">
+				<model package="EAPK_94194397_D26C_4972_AE3E_34F5B925DA64" 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="2023-06-26 15:54:44" 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="contract"/>
+				<links>
+					<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_D68065CA_2D18_479d_95EB_23D106ED6921" start="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8" end="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029"/>
+					<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="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" xmi:type="uml:Package" name="review" scope="public">
+				<model package2="EAID_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="2" ea_localid="155" ea_eleType="package"/>
+				<properties isSpecification="false" sType="Package" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2022-06-02 10:36:37" modified="2023-06-20 11:33: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="document"/>
+				<packageproperties version="1.0" tpos="2"/>
+				<paths/>
+				<times created="2022-06-02 10:36:37" modified="2022-06-02 10:36:46"/>
+				<flags iscontrolled="FALSE" isprotected="FALSE" usedtd="FALSE" logxml="FALSE"/>
+			</element>
+			<element xmi:idref="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" xmi:type="uml:Class" name="epo:ReviewDecision" scope="public">
+				<model package="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" 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="2023-03-12 11:42: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="review"/>
+				<attributes>
+					<attribute xmi:idref="EAID_E6D7A48F_CB77_4e9d_93C3_62DD41ADF53D" name="epo:hasDecisionDate" scope="Public">
 						<initial/>
-						<documentation value="The name or names of a unit of administration related to the exercise of jurisdictional rights, for local, regional and national governance. Level 1 refers to the uppermost administrative unit for the address, almost always a country.&#xA;&#xA;Additional Information:&#xA;Best practice is to use the ISO 3166-1 code but if this is inappropriate for the context, country names should be provided in a consistent manner to reduce ambiguity. For example, either write 'France' or 'FRA' consistently throughout the dataset and avoid mixing the two. The Country controlled vocabulary from the Publications Office can be reused for this."/>
-						<model ea_localid="2092" ea_guid="{79C9C8AE-515F-4e62-A7A2-8994B97F40FC}"/>
-						<properties type="rdf:langString" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date of the review decision.&#xA;&#xA;Additional information:&#xA;This attribute corresponds to the BT-787 Review Date in eForms.&#xA;"/>
+						<model ea_localid="2055" ea_guid="{E6D7A48F-CB77-4e9d-93C3-62DD41ADF53D}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="8"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22575,81 +23967,33 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_BC49BAC4_42EA_469b_B74A_6F71FE025E9D" name="locn:postCode" scope="Public">
-						<initial/>
-						<documentation value="The post/zip code of an address. (INSPIRE's definition is &quot;A code created and maintained for postal purposes to identify a subdivision of addresses and postal delivery points.&quot;)&#xA;&#xA;Additional Information:&#xA;Post codes are common elements in many countries' postal address systems. One of the many post codes of Paris is for example &quot;75000&quot;."/>
-						<model ea_localid="1537" ea_guid="{BC49BAC4-42EA-469b-B74A-6F71FE025E9D}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="17"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_2AAAB836_ACFF_41ba_AA83_669E38B9DCC0" name="locn:thoroughfare" scope="Public">
-						<initial/>
-						<documentation value="An address component that represents the name or names of a passage or way through from one location to another. A thoroughfare is not necessarily a road, it might be a waterway or some other feature.&#xA;&#xA;Additional Information:&#xA;For example, &quot;Avenue des Champs-&amp;#201;lys&amp;#233;es&quot;."/>
-						<model ea_localid="1541" ea_guid="{2AAAB836-ACFF-41ba-AA83-669E38B9DCC0}"/>
-						<properties type="rdf:langString" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="21"/>
-						<stereotype/>
-						<bounds lower="0" upper="*"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_626183B8_93AC_4300_B227_85988E5F2016" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40"/>
-					<Association xmi:id="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_D0F25E0B_E148_41e7_8C52_BAE14F5149F6" start="EAID_29678A10_6473_461a_BE84_76269B5BBD68" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<Association xmi:id="EAID_28236B4B_9308_46ad_9581_3601B37AA6A4" start="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" start="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" start="EAID_82AA47D1_6939_4328_8108_0018817C75BD" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
+					<Generalization xmi:id="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Association xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
+					<Dependency xmi:id="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_E95530AB_B746_4056_8805_0F3BB79051BE"/>
+					<Association xmi:id="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Dependency xmi:id="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
+					<Dependency xmi:id="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" xmi:type="uml:Class" name="locn:Geometry" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:21:04" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" xmi:type="uml:Class" name="epo:ReviewObject" scope="public">
+				<model package="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" 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="2023-03-12 11:42: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="classes"/>
+				<extendedProperties tagged="0" package_name="review"/>
 				<attributes>
-					<attribute xmi:idref="EAID_D017DEC2_D357_4390_80F0_715754917A04" name="cv:coordinates" scope="Public">
+					<attribute xmi:idref="EAID_F646BAC9_50C9_427a_A35D_6F824C0B5371" name="epo:hasElementReference" scope="Public">
 						<initial/>
-						<documentation value="The coordinate list."/>
-						<model ea_localid="1978" ea_guid="{D017DEC2-D357-4390-80F0-715754917A04}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Reference to the class instance in the current notice.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-13716 Change Previous Notice Section Identifier, BT-786	    Review Notice Section Identifier and BT-1501	    Modification Previous Notice Section Identifier."/>
+						<model ea_localid="2056" ea_guid="{F646BAC9-50C9-427a-A35D-6F824C0B5371}"/>
+						<properties type="xsd:anyURI" 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_1CE71D53_1214_4337_9DD2_EE0515B85B64" name="cv:longitude" scope="Public">
-						<initial/>
-						<documentation value="The longitude."/>
-						<model ea_localid="1662" ea_guid="{1CE71D53-1214-4337-9DD2-EE0515B85B64}"/>
-						<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"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -22658,15 +24002,15 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8602AC5B_BF7B_41b5_91EC_CB0218B68ABA" name="cv:latitude" scope="Public">
+					<attribute xmi:idref="EAID_E1570BF4_A663_4c85_A496_E79BDE625A17" name="epo:hasReviewURL" scope="Public">
 						<initial/>
-						<documentation value="The latitude."/>
-						<model ea_localid="1663" ea_guid="{8602AC5B-BF7B-41b5-91EC-CB0218B68ABA}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="7"/>
+						<documentation value="The internet address of the documents concerning the review instance.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-794 Review URL.&#xA;"/>
+						<model ea_localid="2015" ea_guid="{E1570BF4-A663-4c85-A496-E79BDE625A17}"/>
+						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -22675,41 +24019,47 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_F48E8C16_CD7F_4664_8346_839CB32AF64E" start="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" end="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE"/>
+					<Association xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Generalization xmi:id="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
+					<Generalization xmi:id="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Association xmi:id="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" start="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Association xmi:id="EAID_6F34B051_9C2E_444e_83DD_D95F6EA9897B" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Generalization xmi:id="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<NoteLink xmi:id="EAID_D16E8CBE_1896_4301_B20D_B5228F72117A" start="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" xmi:type="uml:Class" name="org:Organization" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:54" complexity="1" status="Proposed"/>
+			<element xmi:idref="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" xmi:type="uml:Class" name="epo:ReviewRequest" scope="public">
+				<model package="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" 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="2022-06-02 10:40: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"/>
+				<extendedProperties tagged="0" package_name="review"/>
 				<attributes>
-					<attribute xmi:idref="EAID_18C4DE72_F4BC_41d4_AC3D_ED76B4DB6031" name="epo:hasLegalName" scope="Public">
+					<attribute xmi:idref="EAID_DF825E2F_0CD1_4414_A52F_5BC33374FE6D" name="epo:hasNumberOfReviewRequests" scope="Public">
 						<initial/>
-						<documentation value="The officially registered name of an organisation. &#xA;&#xA;WG Approval 10/01/2023"/>
-						<model ea_localid="1933" ea_guid="{18C4DE72-F4BC-41d4-AC3D-ED76B4DB6031}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The number of requests the buyer received to review any of its decisions."/>
+						<model ea_localid="1991" ea_guid="{DF825E2F-0CD1-4414-A52F-5BC33374FE6D}"/>
+						<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="0"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_F9D92C82_287B_4f3e_B5F8_58A2BD4FE9E1" name="epo:hasOrganisationUnitName" scope="Public">
+					<attribute xmi:idref="EAID_661FB233_D59B_44ce_A5E7_049DA74AA55E" name="epo:isWithdrawn" scope="Public">
 						<initial/>
-						<documentation value="The name of a subpart of an organisation.&#xA;&#xA;Additional Information:&#xA;E.g. the relevant department of a large organisation.&#xA;&#xA;We added this attribute in case of eProcurement notices where the Buyer is actually a part of an Organization and the rest of the properties apply to the rest of the Organisation as well."/>
-						<model ea_localid="2041" ea_guid="{F9D92C82-287B-4f3e-B5F8-58A2BD4FE9E1}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The review request was withdrawn.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-796 Review Request Withdrawn."/>
+						<model ea_localid="2016" ea_guid="{661FB233-D59B-44ce-A5E7-049DA74AA55E}"/>
+						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="1"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22718,13 +24068,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_007010B6_A8F8_4270_B7F3_A6520D473D5E" name="epo:hasBuyerLegalTypeDescription" scope="Public">
+					<attribute xmi:idref="EAID_59422748_C11F_437d_8F7E_44D4FAF1B79E" name="epo:hasWithdrawalDate" scope="Public">
 						<initial/>
-						<documentation value="Self-explanatory text about the Buyer Legal Type.&#xA;&#xA;Additional information:&#xA;This field is used when the Buyer Legal Type is not available in the controlled list at-voc:buyer-legal-type . This is necessary in to cover data provided in the TED Standard Forms. It shall be deprecated in the future. &#xA;&#xA;WG Approval 06/09/2022"/>
-						<model ea_localid="2113" ea_guid="{007010B6-A8F8-4270-B7F3-A6520D473D5E}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date and time when the request for review was withdrawn.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-797 Review Request Withdrawn Date."/>
+						<model ea_localid="2017" ea_guid="{59422748-C11F-437d-8F7E-44D4FAF1B79E}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="3"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22733,13 +24083,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_37683BEF_44D2_405c_BD81_82AFC900B45E" name="epo:hasLegalFormType" scope="Public">
+					<attribute xmi:idref="EAID_383157AA_E023_4686_B908_2AA037456757" name="epo:hasWithdrawalReason" scope="Public">
 						<initial/>
-						<documentation value="The classification of an Organisation according to legislation.&#xA;&#xA;Additional Information:&#xA;Generally, this is defined for Tenderers who want to submit as an Organisation Group.&#xA;Note that the codelist provided at national level should be used.&#xA;"/>
-						<model ea_localid="1694" ea_guid="{37683BEF-44D2-405c-BD81-82AFC900B45E}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<documentation value="The explanation for withdrawing the request for review.&#xA;&#xA;Additional information:&#xA;This attribute corresponds in eForms to BT-798 Review Request Withdrawn Reasons"/>
+						<model ea_localid="2018" ea_guid="{383157AA-E023-4686-B908-2AA037456757}"/>
+						<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/>
@@ -22748,11 +24098,11 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_603D2E08_0496_4bc9_88B1_69BC1C7E7EC5" name="epo:hasMainActivityDescription" scope="Public">
+					<attribute xmi:idref="EAID_DAD71412_37CA_4488_BBCA_E16D118CC6D8" name="epo:hasRequestDate" scope="Public">
 						<initial/>
-						<documentation value="Self-explanatory text about the Main Activity .&#xA;&#xA;Additional information:&#xA;This field is used when the Main Activity is not available in the controlled list at-voc:main-activity-type . This is necessary in to cover data provided in the TED Standard Forms. It shall be deprecated in the future. &#xA;&#xA;WG Approval 06/09/2022&#xA;"/>
-						<model ea_localid="2112" ea_guid="{603D2E08-0496-4bc9-88B1-69BC1C7E7EC5}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date when the review request was submitted.&#xA;&#xA;Additional information:&#xA;This attribute corresponds to the BT-787 Review Date in eForms.&#xA;"/>
+						<model ea_localid="2054" ea_guid="{DAD71412-37CA-4488-BBCA-E16D118CC6D8}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
 						<containment containment="Not Specified" position="4"/>
 						<stereotype/>
@@ -22763,123 +24113,74 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_92AEFFF2_FA4D_44f1_804B_58D9571C4D04" name="epo:hasInternetAddress" scope="Public">
-						<initial/>
-						<documentation value="The main web page used by the instance of the concept.&#xA;&#xA;WG Approval 01/06/2023&#xA;"/>
-						<model ea_localid="2147" ea_guid="{92AEFFF2-FA4D-44f1-804B-58D9571C4D04}"/>
-						<properties type="xsd:anyURI" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="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>
-					<Association xmi:id="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Dependency xmi:id="EAID_15FE118D_5443_4723_8887_BFF48DC77200" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC"/>
-					<Generalization xmi:id="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1"/>
-					<Dependency xmi:id="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<Association xmi:id="EAID_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_29678A10_6473_461a_BE84_76269B5BBD68"/>
-					<Association xmi:id="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_33E9269C_0B96_4b38_A129_C30771A9833F"/>
-					<Association xmi:id="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39"/>
-					<Dependency xmi:id="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825" start="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" end="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE"/>
-					<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_0AA8BD10_946A_403c_B906_6DB183F74D9F" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Generalization xmi:id="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Generalization xmi:id="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" start="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Association xmi:id="EAID_F3F440DD_AB87_4730_A6DF_915A5FB0B3DB" start="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
-					<Generalization xmi:id="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" start="EAID_48133D6A_BE44_43c9_A647_04650698EC95" end="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322"/>
+					<Generalization xmi:id="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
+					<Dependency xmi:id="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
+					<Association xmi:id="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
+					<Dependency xmi:id="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3" start="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" end="EAID_E95530AB_B746_4056_8805_0F3BB79051BE"/>
+					<Association xmi:id="EAID_9663763E_2F48_4952_926C_444F368462AA" start="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" end="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" xmi:type="uml:Class" name="epo:AwardDecision" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:49" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_9AFA4E58_C454_4088_8C81_AE5E88B89E9B" tpos="0" ea_localid="1712" ea_eleType="element"/>
+				<properties documentation="What are the entities that can be reviewed?" isSpecification="false" sType="Note" nType="1" scope="public"/>
+				<project author="lps" version="1.0" phase="1.0" created="2022-04-05 10:20:20" modified="2022-04-05 10:20: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;"/>
 				<tags/>
 				<xrefs/>
-				<extendedProperties tagged="0" package_name="classes"/>
-				<attributes>
-					<attribute xmi:idref="EAID_056A68FB_CC31_4937_8CD8_3FFE6692677E" name="epo:hasAwardDecisionDate" scope="Public">
-						<initial/>
-						<documentation value="The official date of the award decision.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-1451 Winner Decision Date.&#xA;&#xA;WG Approval 09/01/2020&#xA;"/>
-						<model ea_localid="1970" ea_guid="{056A68FB-CC31-4937-8CD8-3FFE6692677E}"/>
-						<properties type="xsd:dateTime" 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_BE5D6D69_56E5_4540_9E6C_9ECA9C74AD61" name="epo:hasAdditionalNonAwardJustification" scope="Public">
-						<initial/>
-						<documentation value="Further justification for the non award .&#xA;&#xA;Additional information: &#xA;This is generally used when the non award reason code is set to &quot;Other&quot;.&#xA;&#xA;WG: 18/01/2022"/>
-						<model ea_localid="1972" ea_guid="{BE5D6D69-56E5-4540-9E6C-9ECA9C74AD61}"/>
-						<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>
+				<extendedProperties tagged="0" package_name="review" relatedlinks="idref1=;"/>
 				<links>
-					<Generalization xmi:id="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<Association xmi:id="EAID_CF215D61_0282_4111_B11C_CBD651205C58" start="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" end="EAID_E7437025_771F_4143_BE33_620A29646687"/>
-					<Association xmi:id="EAID_2EC2BFAF_50AE_496d_A93E_27A2FA651CF4" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-					<Association xmi:id="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649" start="EAID_96B284C4_E759_4bad_9655_04521F703750" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-					<Association xmi:id="EAID_5465A41A_7AD8_4020_9E57_C032F2801A7A" start="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-					<Association xmi:id="EAID_A1441146_4BC0_49e9_847D_7D2636FCB6FA" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
-					<Association xmi:id="EAID_EBAA0FEE_B552_4003_8B98_ADD4600E7BA1" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8"/>
+					<NoteLink xmi:id="EAID_D16E8CBE_1896_4301_B20D_B5228F72117A" start="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF" end="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" xmi:type="uml:Class" name="epo:ProcurementObject" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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_6B65084A_798D_4f35_BA8F_EF75ACEBC684" 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="2022-04-28 23:39:31" 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="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"/>
+			</element>
+			<element xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" xmi:type="uml:Class" name="epo:ChangeInformation" scope="public">
+				<model package="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" 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="2023-09-01 16:44: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="classes"/>
+				<extendedProperties tagged="0" package_name="notice description"/>
 				<attributes>
-					<attribute xmi:idref="EAID_DF5B1B42_9DD2_4e8d_A789_27EB4A9F5270" name="epo:isSMESuitable" scope="Public">
+					<attribute xmi:idref="EAID_BF36FFA5_CE97_49d3_8482_D1EAA764E7D8" name="epo:hasChangeDescription" scope="Public">
 						<initial/>
-						<documentation value="The Lot is suitable for small and medium enterprises (SMEs).&#xA;&#xA;Additional Information&#xA;&#xA;This allows the buyer to make emphasis on the fact that the procedure has been designed having SMEs in mind. This indicator is also to be reflected in the selection criteria.&#xA;&#xA;For example, number of employees and turnover are applicable to the definition of an SME.&#xA;&#xA;WG Approval 15/10/2019&#xA;"/>
-						<model ea_localid="2059" ea_guid="{DF5B1B42-9DD2-4e8d-A789-27EB4A9F5270}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="1"/>
+						<documentation value="Explanatory text about the instance of the concept.&#xA;&#xA;WG Approval 30/09/2019"/>
+						<model ea_localid="1572" ea_guid="{BF36FFA5-CE97-49d3-8482-D1EAA764E7D8}"/>
+						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0" scale="0"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_AAB414E4_6B76_4724_850E_FD4E9D1A9A36" name="epo:hasAdditionalInformation" scope="Public">
+					<attribute xmi:idref="EAID_02F1FD10_4A7F_44a3_90AE_DC4CE167531B" name="epo:hasChangeReasonDescription" scope="Public">
 						<initial/>
-						<documentation value="Supplementary data about the instance of the concept.&#xA;&#xA;WG Approval 15/10/2019"/>
-						<model ea_localid="1672" ea_guid="{AAB414E4-6B76-4724-850E-FD4E9D1A9A36}"/>
+						<documentation value="Explanatory text about why the element is altered.&#xA;&#xA;Additional information:&#xA;This corresponds in eForms to BT-762 Change Reason Description."/>
+						<model ea_localid="1574" ea_guid="{02F1FD10-4A7F-44a3-90AE-DC4CE167531B}"/>
 						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0" scale="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -22888,13 +24189,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_81C8CC43_F9F3_4dbf_B86E_3117B7D59284" name="epo:isUsingEUFunds" scope="Public">
+					<attribute xmi:idref="EAID_47233B60_638C_465b_985C_46C4F92E2998" name="epo:isProcurementDocumentChanged" scope="Public">
 						<initial/>
-						<documentation value="The procurement foresees funding by the Union.&#xA;&#xA;Additional Information:&#xA;The funding may cover the whole procurement or part of the procurement.&#xA;&#xA;For example the European Structural and Investment Funds or grants awarded by the European Union.&#xA;&#xA;"/>
-						<model ea_localid="2060" ea_guid="{81C8CC43-F9F3-4dbf-B86E-3117B7D59284}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="2"/>
+						<documentation value="One or more procurement documents have been changed.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-718 Change Procurement Documents&#xA;&#xA;WG Approval 05/11/2019"/>
+						<model ea_localid="1573" ea_guid="{47233B60-638C-465b-985C-46C4F92E2998}"/>
+						<properties type="xsd:boolean" 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/>
@@ -22903,13 +24204,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_7963EE6A_6E17_4cc0_9D4D_F2B3BD7DDB82" name="epo:isCoveredByGPA" scope="Public">
+					<attribute xmi:idref="EAID_DD81DA72_316E_4eed_9253_86D09F747DE7" name="epo:hasProcurementDocumentChangeDate" scope="Public">
 						<initial/>
-						<documentation value="Specifies whether the Agreement on Government Procurement (GPA) applies.&#xA;&#xA;Additional information: &#xA;The GPA aims to establish a multilateral framework of balanced rights and obligations relating to public contracts with a view to achieving the liberalization and expansion of world trade.&#xA;&#xA;This corresponds in the e Forms to BT-115	    GPA Coverage.&#xA;&#xA;WG Approval 15/10/2019&#xA;&#xA;"/>
-						<model ea_localid="1666" ea_guid="{7963EE6A-6E17-4cc0-9D4D-F2B3BD7DDB82}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date and time of the change.&#xA;&#xA;Additional information: &#xA;This corresponds in eForms to BT-719	 Change Procurement Documents Date&#xA;&#xA;WG Approval 5/11/2019&#xA;"/>
+						<model ea_localid="1576" ea_guid="{DD81DA72-316E-4eed-9253-86D09F747DE7}"/>
+						<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"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22918,13 +24219,13 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_C4978D81_7036_4dff_887C_4784F26EE895" name="epo:isRecurrent" scope="Public">
+					<attribute xmi:idref="EAID_AE22FB25_6A09_4dd9_A1E2_34E02F94BF9A" name="epo:hasAdditionalInformation" scope="Public">
 						<initial/>
-						<documentation value="The Procurement being notified is likely to be included in another procedure in the foreseeable future.&#xA;&#xA;Additional Information:&#xA;&#xA;For example, a regularly re-tendered municipal service. This does not include awarding multiple contracts within a single qualification system, framework agreement, or a dynamic purchasing system.&#xA;&#xA;This corresponds in eForms to BT-94 Recurrence.&#xA;&#xA;WG Approval 12/05/2020&#xA;"/>
-						<model ea_localid="2082" ea_guid="{C4978D81-7036-4dff-887C-4784F26EE895}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="Supplementary data about the instance of the concept.&#xA;&#xA;WG Approval 15/10/2019&#xA;"/>
+						<model ea_localid="2426" ea_guid="{AE22FB25-6A09-4dd9-A1E2-34E02F94BF9A}"/>
+						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="4"/>
+						<containment containment="Not Specified" position="6"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22933,13 +24234,33 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8F62A6D7_E2B5_4316_8B14_C02E3FA048F0" name="epo:hasRecurrenceDescription" scope="Public">
+				</attributes>
+				<links>
+					<Generalization xmi:id="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
+					<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_84490705_94B3_445f_ACA6_A903591C3651" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_B2FED202_9ACA_415c_B2AB_A1E3E26E726C" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7"/>
+					<Association xmi:id="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97" start="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<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="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" xmi:type="uml:Class" name="epo:NonPublishedInformation" scope="public">
+				<model package="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" 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="2023-07-04 14:39: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="notice description"/>
+				<attributes>
+					<attribute xmi:idref="EAID_1AFEEB35_CA65_4203_912D_52E9A6F5BE28" name="epo:hasAccessibilityDate" scope="Public">
 						<initial/>
-						<documentation value="Any additional information about the recurrence of the Procurement.&#xA;&#xA;Additional Information:&#xA;For example estimated timing of the Procedure.&#xA;&#xA;This corresponds in eForms to BT-95 Recurrence Description.&#xA;&#xA;(WG approval 2019-01-16)&#xA;"/>
-						<model ea_localid="2083" ea_guid="{8F62A6D7-E2B5-4316-8B14-C02E3FA048F0}"/>
-						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<documentation value="The date at which unpublished data shall be published.&#xA;&#xA;WG Approval 11/06/2020"/>
+						<model ea_localid="1994" ea_guid="{1AFEEB35-CA65-4203-912D-52E9A6F5BE28}"/>
+						<properties type="xsd:date" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="5"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="1"/>
 						<options/>
@@ -22948,127 +24269,88 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_9D9B9980_E3C9_4487_8DC0_2F870FD3CE34" name="epo:hasLegalBasisDescription" scope="Public">
+					<attribute xmi:idref="EAID_3CBF449C_4234_4f51_9B91_AEF3E04AF3F0" name="epo:hasConfidentialityJustification" scope="Public">
 						<initial/>
-						<documentation/>
-						<model ea_localid="2348" ea_guid="{9D9B9980-E3C9-4487-8DC0-2F870FD3CE34}"/>
+						<documentation value="A narrative explanation of why data is not published.&#xA;&#xA;Additional Information:&#xA;This element is generally used when the non-publication-justification code chosen is &quot;other&quot;.&#xA;&#xA;WG Approval 09/11/2021&#xA;"/>
+						<model ea_localid="1995" ea_guid="{3CBF449C-4234-4f51-9B91-AEF3E04AF3F0}"/>
 						<properties type="rdf:PlainLiteral" collection="false" static="0" duplicates="0" changeability="changeable"/>
 						<coords ordered="0"/>
-						<containment containment="Not Specified" position="6"/>
+						<containment containment="Not Specified" position="3"/>
 						<stereotype/>
-						<bounds lower="0" upper="*"/>
+						<bounds lower="0" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;"/>
+						<styleex value="volatile=0;union=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Association xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-					<Association xmi:id="EAID_0F625CFF_139F_4712_8BB6_681888ACB178" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_495BBB92_468A_4f08_9330_A0C75730B97A"/>
-					<Dependency xmi:id="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
-					<Association xmi:id="EAID_818697AF_821C_40da_B5DE_D7ED82169378" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D"/>
-					<Association xmi:id="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA"/>
-					<Association xmi:id="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
-					<Generalization xmi:id="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-					<Association xmi:id="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Association xmi:id="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6"/>
-					<NoteLink xmi:id="EAID_55FB6FB6_1605_4f39_BFBE_32CA1C1F5228" start="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<Association xmi:id="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" start="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<Association xmi:id="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<Generalization xmi:id="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<Generalization xmi:id="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<NoteLink xmi:id="EAID_D957499E_9DCB_46c9_BF9D_2D348A5961B1" start="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
+					<Association xmi:id="EAID_3FEA813D_50A9_4b54_8B7C_0A19B505F52F" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C"/>
+					<Association xmi:id="EAID_605B2EA3_201D_47cb_BCF7_9C5A5DD40C4B" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<Dependency xmi:id="EAID_632541C4_7CDB_4357_B46D_C59F2C5DFB96" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_0164D322_9C4D_4db0_BDC4_2A3D0BC53931"/>
+					<Generalization xmi:id="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" start="EAID_3E3C6304_E823_43a1_8914_2046342E8F96" end="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" xmi:type="uml:Class" name="epo:Lot" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<element xmi:idref="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" xmi:type="uml:Note" scope="public">
+				<model package="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" tpos="0" ea_localid="3061" ea_eleType="element"/>
+				<properties documentation="Added hasAdditionalInformation to cover for section VII.2 in F14, since we do not have the Corrigendum notice type anymore in eForms." isSpecification="false" sType="Note" nType="0" scope="public"/>
+				<project author="andreea" version="1.0" phase="1.0" created="2023-06-14 19:28:20" modified="2023-06-14 19:29:13" 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="classes"/>
+				<extendedProperties tagged="0" package_name="notice description"/>
 				<links>
-					<Association xmi:id="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<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_BE41CCFB_8495_440b_ADCE_908A980E0342" start="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<Association xmi:id="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<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_20B9978D_8D66_48ab_B3C3_6654ABB348DF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_34156914_725C_4a26_B380_6FDE59360DAF" start="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_3656734D_7238_4738_9F80_EC054ABA2E24" start="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_389050E1_4285_45aa_87A9_6A9BA62CD554" start="EAID_D847D616_70DB_473a_A2A4_6665F938474C" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Association xmi:id="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<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_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_D9990D3C_51ED_4626_9195_C96F98BD3349" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
+					<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="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" xmi:type="uml:Class" name="epo:PlannedProcurementPart" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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="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="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="classes"/>
-				<links>
-					<Association xmi:id="EAID_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_3780AA50_D898_4068_B300_47B46651CA0A"/>
-					<Generalization xmi:id="EAID_71953D29_84AD_4774_9664_258E887283AF" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-					<Association xmi:id="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<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_EB2AC560_378D_4c18_9647_0E2E150D7463" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969"/>
-					<Association xmi:id="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" start="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-					<NoteLink xmi:id="EAID_8A689597_C8A3_475b_AD2A_EA61AB152656" start="EAID_A7E3EEA1_BBD5_409a_9717_8E5FF181CF7E" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-					<NoteLink xmi:id="EAID_A663CF6F_0B0E_47fa_B841_73C5D3CD3B56" start="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-					<Association xmi:id="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90" start="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" end="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A"/>
-				</links>
+				<extendedProperties tagged="0" package_name="eProcurementOntology"/>
+				<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_8F3A6A54_584E_4f65_80B0_0C345D6703F4" xmi:type="uml:Class" name="epo:Procedure" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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>
-					<tag xmi:id="EAID_A806D67B_9FD6_443d_96C0_5C16D87CAE4A" name="skos:editorialNote" value="this is a note" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-					<tag xmi:id="EAID_80468605_06C0_4b54_BC3F_AE19F3C873F2" name="skos:Label@fr" value="this is a french label" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-					<tag xmi:id="EAID_197C3636_E54A_454d_979F_78BC36A23A76" name="skos:prefLabel@ro" value="this is a romanina" modelElement="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
-				</tags>
-				<xrefs value="$XREFPROP=$XID={452B37C3-EFC2-4781-A983-8D16A2F56F79}$XID;$NAM=CustomProperties$NAM;$TYP=element property$TYP;$VIS=Public$VIS;$DES=@PROP=@NAME=isActive@ENDNAME;@TYPE=Boolean@ENDTYPE;@VALU=@ENDVALU;@PRMT=@ENDPRMT;@ENDPROP;$DES;$CLT={8F3A6A54-584E-4f65-80B0-0C345D6703F4}$CLT;$ENDXREF;"/>
-				<extendedProperties tagged="0" package_name="classes" eventflags="LNK=6b05;"/>
+				<tags/>
+				<xrefs/>
+				<extendedProperties tagged="0" package_name="empirical types"/>
 				<attributes>
-					<attribute xmi:idref="EAID_790B2918_2B58_40de_B8E7_6698AA589C5E" name="epo:isAccelerated" scope="Public">
+					<attribute xmi:idref="EAID_DD21A105_2536_4ae0_A606_3868B9A27714" name="skos:notation" scope="Public">
 						<initial/>
-						<documentation value="Statement about  the fact that the procedure will be reduced due to a state of urgency.&#xA;&#xA;Additional Information&#xA;&#xA;This modifies the time limit for the receipt of requests to participate or the receipt of tenders.&#xA;&#xA;WG Approval 20/08/2019&#xA;"/>
-						<model ea_localid="1721" ea_guid="{790B2918-2B58-40de-B8E7-6698AA589C5E}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="0" upper="1"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_8DBF2461_62A0_40d3_B39B_A3C66EAE9CD7" name="epo:hasAcceleratedProcedureJustification" scope="Public">
+					<attribute xmi:idref="EAID_EC13F7E5_C9A2_45ce_A2E4_3AFC67778C5B" name="adms:schemaAgency" scope="Public">
 						<initial/>
-						<documentation value="The reasons why the procedure is accelerated.&#xA;&#xA;Additional Information:&#xA;A procedure is accelerated to cover needs of extraordinary circumstances ie earthquake relief.&#xA;&#xA;WG Approval 09/06/2020&#xA;&#xA;"/>
-						<model ea_localid="1722" ea_guid="{8DBF2461-62A0-40d3-B39B-A3C66EAE9CD7}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="By Value" position="1"/>
+						<containment containment="Not Specified" position="2"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
@@ -23077,112 +24359,147 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_1237AF42_0ACB_4905_9E98_37EB4AD1C8CE" name="epo:hasMainFeature" scope="Public">
+					<attribute xmi:idref="EAID_291D3917_532F_4950_B4BF_22835EC1F3E6" name="epo:hasScheme" scope="Public">
 						<initial/>
-						<documentation value="Main features of the procedure and information about where the full rules for the procedure can be found. &#xA;&#xA;Additional Information:&#xA;This information should be given when the procedure is not one of those mentioned in the procurement directives. This can be the case for example for concessions, for social and other specific services, and in case of voluntary publication of procurement procedures below the EU procurement thresholds."/>
-						<model ea_localid="1724" ea_guid="{1237AF42-0ACB-4905-9E98-37EB4AD1C8CE}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="3"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
 						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DCB6F0F3_A5AA_4582_8838_5A6AE79C81A6" name="epo:isJointProcurement" scope="Public">
+					<attribute xmi:idref="EAID_34EA5DFD_574A_4a69_9F19_59FCED4CCEFC" name="epo:hasSchemeVersion" scope="Public">
 						<initial/>
-						<documentation value="Multiple buyers procure together within the same procedure.&#xA;&#xA;Addition Information:&#xA;In case the joint procurement involves buyers from different countries, the national law is specified by the epo:hasCrossBorderLaw in the ProcedureTerm . "/>
-						<model ea_localid="2071" ea_guid="{DCB6F0F3-A5AA-4582-8838-5A6AE79C81A6}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
+						<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="1"/>
-						<options/>
-						<style/>
-						<styleex value="volatile=0;union=0;"/>
-						<tags/>
-						<xrefs/>
-					</attribute>
-					<attribute xmi:idref="EAID_E1AF6ECF_E2E5_420f_B454_601D03392D27" name="epo:isDesignContest" scope="Public">
-						<initial/>
-						<documentation value="A competition which enables the buyer to acquire a  plan or design via a jury.&#xA;&#xA;Additional information: &#xA;Design contests have traditionally mostly been used in the fields of town and country planning, architecture and engineering or data processing, other purposes, such as to obtain plans for financial engineering &#xA;&#xA;The contest may include or not the award of prizes;&#xA;&#xA;WG approval 04-02-2021 "/>
-						<model ea_localid="1923" ea_guid="{E1AF6ECF-E2E5-420f-B454-601D03392D27}"/>
-						<properties type="xsd:boolean" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0"/>
-						<containment containment="Not Specified" position="16"/>
-						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_169198B9_544A_4d67_9273_0F076E0C1306" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37"/>
-					<Association xmi:id="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD"/>
-					<Association xmi:id="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_49EC0F16_408C_4b28_B611_0048946DC070"/>
-					<Association xmi:id="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_96B284C4_E759_4bad_9655_04521F703750"/>
-					<Generalization xmi:id="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" start="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" end="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5"/>
-					<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_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_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"/>
-					<Association xmi:id="EAID_F955E894_651A_4a8b_A411_E8DA312BC449" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" end="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4"/>
+					<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_11702782_CA5B_4035_84B7_1E5035469B29" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" 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_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_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_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_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_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_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" xmi:type="uml:Class" name="epo:LotGroup" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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="classes"/>
+				<extendedProperties tagged="0" package_name="empirical types"/>
 				<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_608CC8C6_3A48_4541_8467_9DDA71E8D534" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Association xmi:id="EAID_FC7073E1_3362_472f_B087_27A619B6C819" start="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" end="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4"/>
-					<Association xmi:id="EAID_17DACA2B_8A10_4516_8C96_D5EA3AE635E9" start="EAID_71373AFD_6871_4946_B921_97A716439257" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-					<Association xmi:id="EAID_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" start="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
-					<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_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"/>
-					<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_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_68E68E66_FDF5_4801_BCD0_09D751D046C7" xmi:type="uml:Class" name="epo:ProcurementElement" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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="classes"/>
+				<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_CA1EEF88_2E9E_40ca_8D61_5175A4D36F9E" name="dct:title" scope="Public">
+					<attribute xmi:idref="EAID_2C82F10F_E6DC_49ee_8B5D_E915D4361E9C" name="epo:hasAmountValue" scope="Public">
 						<initial/>
-						<documentation value="A name given to the resource.&#xA;&#xA;WG approval 30/05/2023"/>
-						<model ea_localid="1669" ea_guid="{CA1EEF88-2E9E-40ca-8D61-5175A4D36F9E}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="1"/>
+						<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/>
@@ -23191,12 +24508,12 @@
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_DE1FA5B9_94C7_44ae_BA93_BC77CD3943C8" name="dct:description" scope="Public">
+					<attribute xmi:idref="EAID_9BDDFF77_87A2_428c_A675_CD62FC2FF951" name="epo:hasCurrencyCodeListAgencyName" 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"/>
-						<model ea_localid="1665" ea_guid="{DE1FA5B9-94C7-44ae-BA93-BC77CD3943C8}"/>
-						<properties type="rdf:PlainLiteral" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
-						<coords ordered="0" scale="0"/>
+						<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="*"/>
@@ -23206,67 +24523,163 @@
 						<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>
-					<Association xmi:id="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A"/>
-					<Association xmi:id="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
+					<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_95FB9493_C207_456a_A0EF_B68899832EE8" start="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" end="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398"/>
-					<Generalization xmi:id="EAID_71953D29_84AD_4774_9664_258E887283AF" start="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
-					<Generalization xmi:id="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7"/>
+					<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_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_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" xmi:type="uml:Class" name="epo:Purpose" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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="2023-03-12 13:17:23" 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"/>
+				<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>
-					<Association xmi:id="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC"/>
-					<Dependency xmi:id="EAID_74371426_1670_46df_8526_5A4910F24815" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_E55F2451_5826_4907_B311_4F37313BAEF6"/>
-					<Dependency xmi:id="EAID_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" start="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" end="EAID_E55F2451_5826_4907_B311_4F37313BAEF6"/>
-					<Association xmi:id="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" start="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
-					<Association xmi:id="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19" start="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" end="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07"/>
+					<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_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_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_811D4703_55F7_4d6e_B8D8_207479C15419" xmi:type="uml:Class" name="epo:Tender" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:22:49" complexity="1" status="Proposed"/>
-				<code product_name="Java" gentype="Java"/>
+			<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="classes"/>
+				<extendedProperties tagged="0" package_name="empirical types"/>
 				<attributes>
-					<attribute xmi:idref="EAID_497AFB0F_4C0A_478a_ABA1_C730072CAB97" name="epo:hasElectronicSubmission" scope="Public">
+					<attribute xmi:idref="EAID_439A021A_4789_4775_8650_9C585138E43E" name="epo:hasQuantityValue" scope="Public">
 						<initial/>
-						<documentation value="Transmission of tenders is possible by electronic means of communication. "/>
-						<model ea_localid="1836" ea_guid="{497AFB0F-4C0A-478a-ABA1-C730072CAB97}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="0" upper="1"/>
+						<bounds lower="1" upper="1"/>
 						<options/>
 						<style/>
-						<styleex value="volatile=0;union=0;"/>
+						<styleex value="volatile=0;"/>
 						<tags/>
 						<xrefs/>
 					</attribute>
-					<attribute xmi:idref="EAID_089130B8_3D63_4690_82F1_B357630F3194" name="epo:isVariant" scope="Public">
+					<attribute xmi:idref="EAID_27144131_8BB5_4491_A8AD_C3C93FA46553" name="epo:hasUnitDescription" scope="Public">
 						<initial/>
-						<documentation value="Alternative solution to fulfil the buyer's needs as opposed to solutions indicated in the procurement documents.&#xA;&#xA;Additional Information:&#xA;&#xA;The permission to offer variants is only allowed if specified in a Contract Notice or a Prior Information Notice that used as a means for calling for a competition.&#xA;The buyer lays out minimum requirements in the procurement documents that must be respected by tenderers submitting variants.&#xA;&#xA;WG Approval 29/05/2019&#xA;&#xA;"/>
-						<model ea_localid="1841" ea_guid="{089130B8-3D63-4690-82F1-B357630F3194}"/>
-						<properties type="xsd:boolean" derived="0" collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<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="0"/>
+						<containment containment="Not Specified" position="5"/>
 						<stereotype/>
-						<bounds lower="0" upper="1"/>
+						<bounds lower="0" upper="*"/>
 						<options/>
 						<style/>
 						<styleex value="volatile=0;union=0;"/>
@@ -23275,34 +24688,67 @@
 					</attribute>
 				</attributes>
 				<links>
-					<Dependency xmi:id="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82"/>
-					<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_47C8CD49_71D8_4ef9_919E_87DD36154F85" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C"/>
-					<Association xmi:id="EAID_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C"/>
-					<Dependency xmi:id="EAID_73E0123E_9D07_49c6_BAB3_E937B9F25B43" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F"/>
-					<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_7C98771E_06E0_4141_9CF5_2CFE5FEB856B" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E"/>
-					<Generalization xmi:id="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" start="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" end="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448"/>
-					<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_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"/>
+					<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_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_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_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_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_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_93ACA540_2668_42d3_BE40_C921C05C776E" xmi:type="uml:Class" name="epo:TenderGroup" scope="public">
-				<model package="EAPK_CCFCD073_1862_4b07_B46D_C4D54A6F3024" 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="2023-07-17 18:18:41" complexity="1" status="Proposed"/>
+			<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="classes"/>
+				<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>
-					<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_7A92C123_93F7_4d51_A677_A1E36D3B53C0" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D"/>
-					<Association xmi:id="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" start="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" end="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6"/>
+					<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="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" xmi:type="uml:Package" name="controlled vocabularies" scope="public">
@@ -23650,6 +25096,7 @@
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
 					<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_8A622D7F_F4A3_4934_91F5_54DFBCC7D484" start="EAID_3A26D4B3_0F2F_4513_90E4_F69631B6BEE6" 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"/>
 					<Dependency xmi:id="EAID_E2C29363_440C_4c85_8C4E_38DED0468EB4" start="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" end="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90"/>
 				</links>
@@ -23670,7 +25117,6 @@
 					<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_8E647BBA_AE2A_4ca3_9144_41548E3A43AB" start="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
-					<Dependency xmi:id="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" start="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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"/>
 					<Realisation xmi:id="EAID_E4F802B6_E371_4b25_9741_4111A518F567" start="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2" end="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66"/>
@@ -24079,447 +25525,17 @@
 					<Dependency xmi:id="EAID_90566F74_64BC_49c8_8076_1ECB982268EE" start="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" end="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9"/>
 				</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="16" 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="16"/>
-				<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_11702782_CA5B_4035_84B7_1E5035469B29" start="EAID_2A7F3C7D_DE8E_40cb_B49F_D657B2ABC394" 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_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_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_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_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_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_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_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>
-					<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_1729B069_584F_4a4f_910B_A28B233CEB46" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" 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_FA070646_D88B_493f_96AB_8417E2069155" 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_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_8E718222_A67E_4d16_8978_7B6F899FD855" start="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" 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_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_FA070646_D88B_493f_96AB_8417E2069155" 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="2023-03-12 13:17:23" 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_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" 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_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_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_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_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_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_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"/>
+			<element xmi:idref="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" xmi:type="uml:Enumeration" name="at-voc-new:certification-label-type" scope="public">
+				<model package="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" tpos="26" ea_localid="1949" ea_eleType="element"/>
+				<properties documentation="* environmental/ecological/green, &#xA;* quality, &#xA;* social, etc." 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-11 20:47:15" modified="2023-09-01 16:17: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="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>
+				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<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"/>
+					<Dependency xmi:id="EAID_B62DE754_3523_45c7_9426_333EF3B4B423" start="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" end="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03"/>
 				</links>
 			</element>
 			<element xmi:idref="EAPK_352BAC9B_7F50_4450_B942_C2EA10533C7F" xmi:type="uml:Package" name="datatype" scope="public">
@@ -24608,43 +25624,1368 @@
 			</element>
 		</elements>
 		<connectors>
-			<connector xmi:idref="EAID_A663CF6F_0B0E_47fa_B841_73C5D3CD3B56">
-				<source xmi:idref="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB">
-					<model ea_localid="3097" type="Note"/>
+			<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;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="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_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/>
+					<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="4074"/>
+				<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_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/>
+					<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_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"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3128"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<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:hasPurpose"/>
+				<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"/>
+					<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;"/>
+					<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"/>
+					<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="1617"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<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;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:isFundedBy"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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 name="epo:hasLegalBasis" 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 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;"/>
+					<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;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasLegalBasis"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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:hasLaunchFrameworkAgreementMaximumValue" 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="2799"/>
+				<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:hasLaunchFrameworkAgreementMaximumValue"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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 rb="0..*" rt="+epo:isSubjectToTerm"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1493"/>
+				<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:fulfillsStrategicProcurement"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
+				<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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+					<role name="epo:foreseesConcession" 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="4633"/>
+				<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:foreseesConcession"/>
+				<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"/>
+					<role visibility="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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3180"/>
+				<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:usesTechnique"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
+				<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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</source>
+				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
+					<role name="epo:foreseesContractSpecificTerm" 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="3072"/>
+				<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:foreseesContractSpecificTerm"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
+					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+					<role name="epo:contextualisedBy" 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="3070"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The place of the AgentInRole in the procurement is expressed by a ProcurementObject."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:contextualisedBy"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="4441"/>
+				<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."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:foreseesProcurementObject"/>
+				<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"/>
+					<role visibility="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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2936"/>
+				<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_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;"/>
+					<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"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2659"/>
+				<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_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=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 name="epo:specifiesProcurementCriterion" 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="3063"/>
+				<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"/>
+				<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="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="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 rb="0..*" rt="+epo:isSubjectToLotSpecificTerm"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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="2871"/>
+				<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_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/>
+					<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: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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="2780"/>
+				<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:setsGroupingContextForLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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"/>
+					<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="4691"/>
+				<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:refersToLot"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
+				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
+					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_31976DD6_F85A_4940_AC62_FA4769B4D88C">
+					<model ea_localid="906" type="Class" name="epo:Lot"/>
+					<role name="epo:refersToPreviousProcedureLot" 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="1578"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Reference to one or more Lots in a previous procedure.&#xA;&#xA;Additional Information:&#xA;In the case of Direct Award Terms, this property points to a previous Procedure justifying the use of Direct Award without a prior publication.&#xA;&#xA;This corresponds in the eForms to BT-1252	    Direct Award Justification Previous Procedure Identifier&#xA;&#xA;WG Approval 22/11/2019 14:33:55"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:refersToPreviousProcedureLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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"/>
+					<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="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="1..*" rt="+epo:refersToLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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: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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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:announcesLot"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_38A9CEA0_D542_4a11_AEA0_EC5F24CAF1A1">
+				<source xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30">
+					<model ea_localid="887" type="Class" name="epo:EvaluationBoard"/>
+					<role 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=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:isAssignedForEvaluationOf" 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="1550"/>
+				<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..1" rb="0..*" rt="+epo:isAssignedForEvaluationOf"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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: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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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="1" rt="+epo:isSubmittedForLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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"/>
+					<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="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="1..*" rt="+epo:refersToLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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: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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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:announcesLot"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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:concernsReviewSummaryForLot" 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="2854"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<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."/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:concernsReviewSummaryForLot"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
+				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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:describesLotCompletion" 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="2839"/>
+				<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:describesLotCompletion"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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"/>
+					<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="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="1..*" rt="+epo:refersToLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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: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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3107"/>
+				<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="0..1" rt="+epo:concernsLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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:concernsLot" 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="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:concernsLot"/>
+				<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"/>
+					<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;"/>
+					<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"/>
+					<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="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="1..*" rt="+epo:hasProcurementScopeDividedIntoLot"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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..*" rt="+epo:foreseesTechnique"/>
+				<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"/>
+					<role visibility="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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1441"/>
+				<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"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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 rb="0..1" rt="+epo:hasPlannedDuration"/>
+				<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"/>
 					<role visibility="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_E6781D26_CD82_4c7b_A53A_502157F5F45A">
 					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+					<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4766"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="1433"/>
+				<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:announcesPlannedProcurementPart"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_55FB6FB6_1605_4f39_BFBE_32CA1C1F5228">
-				<source xmi:idref="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA">
-					<model ea_localid="2090" type="Note"/>
+			<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/>
@@ -24654,8 +26995,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+				<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/>
@@ -24665,7 +27006,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3359"/>
+				<model ea_localid="4560"/>
 				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<documentation/>
@@ -24676,527 +27017,789 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0DF6152A_D2C0_4f8c_A6A9_A94ADE3ECB16">
-				<source xmi:idref="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959">
-					<model ea_localid="2898" type="Note"/>
+			<connector xmi:idref="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="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_F8CEA30E_956C_4e31_A38C_468EBD36551A">
-					<model ea_localid="2668" type="Class" name="cv:Channel"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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:refersToPlannedPart" 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="4436"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="2602"/>
+				<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:refersToPlannedPart"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE">
-				<source xmi:idref="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D">
-					<model ea_localid="3088" type="Note"/>
+			<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/>
 					<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_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+				<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;"/>
+					<documentation/>
+					<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;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="1" rt="+epo:hasProcedureType"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4753"/>
-				<properties ea_type="NoteLink" 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/>
+				<labels rb="1..*" rt="+epo:isSubjectToProcedureSpecificTerm"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_33CADDC4_3A87_4925_A302_795332661BE4">
-				<source xmi:idref="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C">
-					<model ea_localid="2106" type="Note"/>
+			<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/>
 					<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_B4F30642_373D_4195_B1E6_10198F138ED8">
-					<model ea_localid="1333" type="Class" name="epo:Awarder"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
-					<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="3394"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:isExecutedByProcurementServiceProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463">
-				<source xmi:idref="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658">
-					<model ea_localid="2097" type="Note"/>
+			<connector xmi:idref="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695">
-					<model ea_localid="2028" type="Class" name="epo-ord:Consignee"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+					<role name="epo:involvesBuyer" 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="3392"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="2509"/>
+				<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:involvesBuyer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B">
-				<source xmi:idref="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30">
-					<model ea_localid="2103" type="Note"/>
+			<connector xmi:idref="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3">
-					<model ea_localid="2017" type="Class" name="epo-ful:Despatcher"/>
+				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+					<role name="epo:isResponsibilityOfBuyer" 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="&#xA;"/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3157"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The buyer in charge of the procedure.&#xA;&#xA;Additional Information:&#xA;In case there are multiple buyers, it may be the case that one or more buyers are in charge of the procedure.&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:isResponsibilityOfBuyer"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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="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="3381"/>
-				<properties ea_type="NoteLink" 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/>
+				<labels rb="0..*" rt="+epo:specifiesProcurementCriteriaSummary"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5">
-				<source xmi:idref="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA">
-					<model ea_localid="2098" type="Note"/>
+			<connector xmi:idref="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
+				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
+					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
 					<role visibility="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_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
-					<model ea_localid="2004" type="Class" name="epo-ord:Originator"/>
+				<target xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
+					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+					<role name="epo:refersToPreviousProcedure" 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="3106"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Reference to a previous procedure.&#xA;&#xA;Additional Information:&#xA;In the case of Direct Award Terms, this property points to a previous Procedure justifying the use of Direct Award without a prior publication.&#xA;&#xA;This corresponds in the eForms to BT-1252	    Direct Award Justification Previous Procedure Identifier"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:refersToPreviousProcedure"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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: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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3391"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="2604"/>
+				<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:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A521BACC_3593_49bc_AB31_246F04F34435">
-				<source xmi:idref="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847">
-					<model ea_localid="2364" type="Note"/>
+			<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;"/>
+					<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"/>
+				<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="3111"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relates to Procedure."/>
+				<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_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/>
+					<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: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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3654"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="1" rt="+epo:refersToProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D957499E_9DCB_46c9_BF9D_2D348A5961B1">
-				<source xmi:idref="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847">
-					<model ea_localid="2364" type="Note"/>
+			<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/>
 					<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"/>
+				<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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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="1" rt="+epo:announcesProcedure"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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-acc:concernsProcedure" 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="3655"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4775"/>
+				<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-acc:concernsProcedure"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<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 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/>
 					<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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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="1" rt="+epo:announcesProcedure"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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: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;"/>
+					<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"/>
+				<model ea_localid="4485"/>
+				<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:refersToProcedure"/>
 				<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_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/>
 					<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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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:refersToProcedure"/>
+				<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;"/>
+					<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="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/>
+				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB">
-				<source xmi:idref="EAID_D67F46E0_2B15_4614_A170_F1414A602530">
-					<model ea_localid="2074" type="Note"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+			<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="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_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
+				<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="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="3339"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4688"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<documentation/>
+				<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/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+adms:identifier"/>
+				<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"/>
+			<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_E58666CF_445F_4da3_97FA_8DD2F8F1AD20">
-					<model ea_localid="1901" type="ProxyConnector" name="ProxyConnector"/>
-					<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="3090"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="4820"/>
+				<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;"/>
 				<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_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B">
-				<source xmi:idref="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C">
-					<model ea_localid="1931" type="ProxyConnector" name="ProxyConnector"/>
+			<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/>
 					<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_70B4792E_F818_45db_80A4_32F092496FEF">
-					<model ea_localid="1932" type="ProxyConnector" name="ProxyConnector"/>
-					<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:hasLaunchFrameworkAgreementMaximumValue" 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="3158"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasLaunchFrameworkAgreementMaximumValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D16E8CBE_1896_4301_B20D_B5228F72117A">
-				<source xmi:idref="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF">
-					<model ea_localid="1712" type="Note"/>
+			<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/>
 					<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_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"/>
-					<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="3134"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
 				<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_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/>
 					<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:NoticeChangeInformation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<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="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/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
-				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
-					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
+			<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/>
 					<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_86057FC2_7717_4160_8952_6A9F572F43B2">
-					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
-					<role name="cccev:constrains" 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"/>
@@ -25205,21 +27808,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3217"/>
+				<model ea_localid="1460"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Information Concept about which a Constraint expresses a limitation.&#xA;&#xA;Additional Information:&#xA;Information Concepts are tools to make Requirements more machine processable: they allow to provide more detail about a Requirement. This way, Constraints can be made very precise, namely the limit that must be achieved, is a limit on the value for the associated Information Concept. For example, the Information Concept would be the age of a person and the Constraint would be the required age in the context of a specific evaluation."/>
+				<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="+cccev:constrains"/>
+				<labels rb="0..*" rt="+epo:definesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_91E24989_0AB1_44de_AF48_1EE54018D9E5">
-				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
-					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
+			<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/>
@@ -25229,10 +27832,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_02014F61_A766_467e_BD3D_7F41689C651B">
-					<model ea_localid="984" type="Enumeration" name="at-voc:number-threshold"/>
-					<role name="epo:hasThresholdType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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;"/>
@@ -25240,53 +27843,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1692"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The method to interpret the threshold value as minimum or a maximum.&#xA;&#xA;WG Approval 17/09/2019&#xA;"/>
+				<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..*" rt="+epo:hasThresholdType"/>
+				<labels rb="1" rt="+epo:describesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A">
-				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
-					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
+			<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/>
 					<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_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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:isSubjectToGrouping" 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="3088"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:isSubjectToGrouping"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D65C20FC_D382_4766_9563_4C96020D607C">
-				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+			<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/>
@@ -25296,9 +27902,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
-					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
-					<role name="epo:hasConstraint" 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:announcesLotGroup" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -25307,55 +27913,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3089"/>
+				<model ea_localid="2426"/>
 				<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:hasConstraint"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C289FCF6_9241_4f06_BF53_F99082792332">
-				<source xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
-					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
+			<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/>
 					<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_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3084"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D84D8FB5_6889_47af_B88A_A418F4281BF1">
-				<source xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
-					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
+			<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/>
@@ -25365,10 +27972,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_31165801_5B33_4e47_B39A_04F149020988">
-					<model ea_localid="1897" type="Enumeration" name="at-voc:criterion"/>
-					<role name="dct:type" 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;"/>
@@ -25376,53 +27983,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4533"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Category to which the Requirement belongs."/>
+				<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="+dct:type"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ACA750D2_84FF_4e07_B735_322F9131A442">
-				<source xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+			<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/>
 					<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_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
-					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3003"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="1" rt="+epo:isSubmittedForLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
-				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
-					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
+			<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/>
@@ -25432,9 +28042,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
-					<role name="cccev:supportsRequirement" 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:refersToLotGroup" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -25443,21 +28053,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3219"/>
+				<model ea_localid="4648"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Requirement for which the Evidence provides proof."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+cccev:supportsRequirement"/>
+				<labels rb="0..*" rt="+epo:refersToLotGroup"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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"/>
+			<connector xmi:idref="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
+				<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/>
@@ -25467,9 +28077,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
-					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
-					<role name="cccev:supportsConcept" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
+					<model ea_localid="2668" type="Class" name="cv:Channel"/>
+					<role name="epo:usesChannel" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -25478,21 +28088,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3222"/>
+				<model ea_localid="4446"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Information Concept providing facts found/inferred from the Evidence.&#xA;&#xA;Additional Information:&#xA;Examples of Information Concepts are values found explictly in the evidence such as a birth date or information derived from the Evidence such as &quot;I am older that 18 years&quot; or &quot;this is a FairTrade product&quot;."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+cccev:supportsConcept"/>
+				<labels rb="0..*" rt="+epo:usesChannel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A7C105EE_0251_4249_919A_46302D44059E">
-				<source xmi:idref="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9">
-					<model ea_localid="1966" type="Class" name="cccev:Evidence"/>
+			<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/>
@@ -25502,10 +28112,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE">
-					<model ea_localid="1969" type="Enumeration" name="at-voc:confidentiality-level"/>
-					<role name="cccev:confidentialityLevelType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -25513,53 +28123,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3221"/>
-				<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.	&#xA;"/>
+				<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..1" rt="+cccev:confidentialityLevelType"/>
+				<labels rb="0..*" rt="+epo:hasInternalIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
+			<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target 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"/>
+				<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="3224"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1423"/>
+				<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;&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/>
+				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
 				<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"/>
+			<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/>
@@ -25572,7 +28185,7 @@
 				<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"/>
+					<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;"/>
@@ -25580,55 +28193,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3218"/>
+				<model ea_localid="3021"/>
 				<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="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"/>
+				<labels rb="1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5">
-				<source xmi:idref="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C">
-					<model ea_localid="1948" type="Class" name="epo-cat:CertificationLabel"/>
+			<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/>
 					<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_86057FC2_7717_4160_8952_6A9F572F43B2">
-					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
-					<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: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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3223"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasTotalQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
-				<source xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
+			<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/>
@@ -25638,10 +28252,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
-					<role name="cccev:hasRequirement" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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;"/>
@@ -25649,67 +28263,64 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3087"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="A more specific Requirement that is part of the Requirement."/>
+				<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..*" rt="+cccev:hasRequirement"/>
+				<labels rb="1..*" rt="+epo:hasMainClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_80871174_3D03_47c3_B90A_189BA5F246D6">
-				<source xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
-					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
+			<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/>
 					<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_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
-					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3991"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<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/>
+				<labels rb="0..*" rt="+epo:hasAdditionalClassification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
-				<source xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
-					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
+			<connector xmi:idref="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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="cv:address" 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"/>
@@ -25718,21 +28329,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4618"/>
+				<model ea_localid="4703"/>
 				<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.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+cv:address"/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+epo:hasPurpose"/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
-				<source xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
-					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+			<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/>
@@ -25742,10 +28353,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
-					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
-					<role name="epo:indicatesInvoiceeContactPoint" visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -25753,34 +28364,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4274"/>
+				<model ea_localid="4822"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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 rt="+epo:indicatesInvoiceeContactPoint"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
-				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+			<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/>
 					<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_33E9269C_0B96_4b38_A129_C30771A9833F">
-					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
-					<role name="epo:hasContactPointInRole" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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;"/>
@@ -25788,48 +28399,48 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1620"/>
+				<model ea_localid="2866"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Incorporates Tender."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasContactPointInRole"/>
+				<labels rb="1..*" rt="+epo:comprisesTender"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
-				<source xmi:idref="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322">
-					<model ea_localid="913" type="Class" name="org:Organization"/>
+			<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;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_33E9269C_0B96_4b38_A129_C30771A9833F">
-					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
-					<role name="epo:hasPrimaryContactPoint" 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:hasTotalValue" 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="1619"/>
+				<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 rb="0..*" rt="+epo:hasPrimaryContactPoint"/>
+				<labels rb="0..1" rt="+epo:hasTotalValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -26109,9 +28720,9 @@
 				<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"/>
+			<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/>
@@ -26121,10 +28732,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:hasEndpointIdentifier" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225">
+					<model ea_localid="916" type="Class" name="cpv: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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -26132,56 +28743,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4115"/>
+				<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..*" rt="+epo:hasEndpointIdentifier"/>
+				<labels rb="0..1" rt="+epo:playedBy"/>
 				<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"/>
+			<connector xmi:idref="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD">
+				<source xmi:idref="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC">
+					<model ea_localid="2902" type="Class" name="epo:AdHocChannel"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_F8CEA30E_956C_4e31_A38C_468EBD36551A">
 					<model ea_localid="2668" type="Class" name="cv:Channel"/>
-					<role name="epo:exposesChannel" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<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="4113"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4447"/>
+				<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:exposesChannel"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3B1AA9A3_574B_4f10_925C_C2404C3C5805">
-				<source xmi:idref="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7">
-					<model ea_localid="2078" type="Class" name="epo:ProcurementElement"/>
+			<connector xmi:idref="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3">
+				<source xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
+					<model ea_localid="856" type="Class" name="epo:Business"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -26191,10 +28801,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
-					<model ea_localid="2668" type="Class" name="cv:Channel"/>
-					<role name="epo:usesChannel" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E">
+					<model ea_localid="973" type="Enumeration" name="at-voc:economic-operator-size"/>
+					<role name="epo:hasBusinessSize" 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;"/>
@@ -26202,34 +28812,66 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4446"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1672"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The category of the business depending on number of employees and turnover.&#xA;&#xA;Additional information:&#xA;&#xA;See Commission Recommendation of 6 May 2003 concerning the definition of micro, small and medium-sized enterprises.&#xA;&#xA;WG Approval 28/05/2020&#xA;&#xA;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..1" rt="+epo:hasBusinessSize"/>
+				<extendedProperties virtualInheritance="0"/>
+				<style/>
+				<xrefs/>
+				<tags/>
+			</connector>
+			<connector xmi:idref="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC">
+				<source xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
+					<model ea_localid="856" type="Class" name="epo:Business"/>
+					<role visibility="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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1673"/>
+				<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:usesChannel"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
-				<source xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
-					<model ea_localid="857" type="Class" name="epo:Buyer"/>
+			<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"/>
+					<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_F8CEA30E_956C_4e31_A38C_468EBD36551A">
-					<model ea_localid="2668" type="Class" name="cv:Channel"/>
-					<role name="epo:exposesInvoiceeChannel" 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;"/>
@@ -26237,21 +28879,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4275"/>
+				<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:exposesInvoiceeChannel"/>
+				<labels rb="1..*" rt="+epo:hasMember"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_845CBDEE_711C_45d7_A3E6_EF880E1787DD">
-				<source xmi:idref="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC">
-					<model ea_localid="2902" type="Class" name="epo:AdHocChannel"/>
+			<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/>
@@ -26261,8 +28903,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
-					<model ea_localid="2668" type="Class" name="cv:Channel"/>
+				<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/>
@@ -26272,7 +28914,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4447"/>
+				<model ea_localid="3189"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -26283,21 +28925,21 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_06D187DF_9192_4549_BE01_736C22D89AEA">
-				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
+			<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_D268976D_01C8_454f_ABBB_CBDD98065B7F">
-					<model ea_localid="969" type="Enumeration" name="at-voc:country"/>
-					<role name="epo:hasCountryCode" 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"/>
@@ -26306,66 +28948,67 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4709"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1446"/>
+				<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:hasCountryCode"/>
+				<labels rb="0..1" rt="+epo:leadBy"/>
 				<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"/>
+			<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="adms:identifier" 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="4713"/>
-				<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="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_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B">
-				<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"/>
+			<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_BECC36B3_D7D3_4161_8FE5_C4EE73295C40">
-					<model ea_localid="986" type="Enumeration" name="at-voc:nuts"/>
-					<role name="epo:hasNutsCode" 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"/>
@@ -26374,19 +29017,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4708"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1695"/>
+				<properties ea_type="Association" direction="Bi-Directional"/>
+				<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"/>
+				<labels lb="0..*" lt="+epo:ownsSystem" rb="0..1" rt="+epo:isOwnedByAgent"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
-				<source xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
+			<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/>
@@ -26396,10 +29041,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -26407,56 +29052,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4705"/>
+				<model ea_localid="3011"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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="+locn:address"/>
+				<labels rb="0..*" 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"/>
+			<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/>
 					<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="locn:geographicIdentifier" 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="4712"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1448"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+locn:geographicIdentifier"/>
+				<labels/>
 				<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"/>
+			<connector xmi:idref="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
+				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -26466,10 +29110,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE">
-					<model ea_localid="1483" type="Class" name="locn:Geometry"/>
-					<role name="locn:geometry" 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 name="epo:playedBy" 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;"/>
@@ -26477,68 +29121,67 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4704"/>
+				<model ea_localid="2549"/>
 				<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="+locn:geometry"/>
+				<labels rb="1" rt="+epo:playedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
-				<source xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843">
-					<model ea_localid="2786" type="Class" name="epo-ord:DeliveryAgreement"/>
+			<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_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo-ord:specifiesDeliveryAgreementLocation" 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="4716"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<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-ord:specifiesDeliveryAgreementLocation"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<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_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo:definesSpecificPlaceOfPerformance" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -26547,21 +29190,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4706"/>
+				<model ea_localid="4578"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ContractTerm has a specific place of performance."/>
+				<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..*" rt="+epo:definesSpecificPlaceOfPerformance"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
-				<source xmi:idref="EAID_EC6C81E1_D9F9_49c8_A889_D9AA2A5B456A">
-					<model ea_localid="2087" type="Class" name="epo-ord:DeliveryInformation"/>
+			<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/>
@@ -26571,9 +29214,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo-ord:specifiesPlaceOfDelivery" 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"/>
@@ -26582,21 +29225,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4717"/>
+				<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-ord:specifiesPlaceOfDelivery"/>
+				<labels rb="0..1" rt="+epo:playedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
-				<source xmi:idref="EAID_E55D9BDA_DEA5_433f_A67D_5F0D11370DF4">
-					<model ea_localid="1831" type="Class" name="epo-cat:Price"/>
+			<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/>
@@ -26606,10 +29249,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo-cat:hasDeliveryLocation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -26617,21 +29260,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4714"/>
+				<model ea_localid="4117"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Location delivery area where the Item can be ordered to the given price.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasDeliveryLocation"/>
+				<labels rb="0..*" rt="+epo:hasLegalIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
-				<source xmi:idref="EAID_25CBAF34_7531_49dd_887E_2CDA11FFB9B8">
-					<model ea_localid="2023" type="Class" name="epo-ful:ShipmentInformation"/>
+			<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/>
@@ -26641,9 +29284,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
-					<model ea_localid="3072" type="Class" name="dct:Location"/>
-					<role name="epo-ful:specifiesPlaceOfDespatch" 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"/>
@@ -26652,21 +29295,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4715"/>
-				<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:specifiesPlaceOfDespatch"/>
+				<labels rb="0..1" rt="+epo:hasMainActivity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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/>
@@ -26676,10 +29317,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
-					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
-					<role name="epo:involvesProcurementDocument" 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;"/>
@@ -26687,55 +29328,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2514"/>
-				<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:involvesProcurementDocument"/>
+				<labels rb="0..1" rt="+epo:hasRegistrationCountry"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3596"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..*" rt="+org:subOrganizationOf"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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/>
@@ -26745,10 +29385,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
-					<model ea_localid="1049" type="Class" name="epo:CatalogueProvider"/>
-					<role name="epo:definesCatalogueProvider" 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="cv:registeredAddress" 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;"/>
@@ -26756,34 +29396,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3124"/>
+				<model ea_localid="1750"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating an AccessTerm has a CatalogueProvider."/>
+				<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..*" rt="+epo:definesCatalogueProvider"/>
+				<labels rb="0..1" rt="+cv:registeredAddress"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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_EA883AD5_9C26_467b_90B7_4F724B6E5E5E">
-					<model ea_localid="1349" type="Class" name="epo:ProcurementProcedureInformationProvider"/>
-					<role name="epo:definesProcurementProcedureInformationProvider" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..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="cv: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;"/>
@@ -26791,90 +29431,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3120"/>
+				<model ea_localid="1506"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating an AccessTerm has a ProcurementProcedureInformationProvider."/>
+				<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="0..1" rt="+epo:definesProcurementProcedureInformationProvide"/>
+				<labels rb="0..*" rt="+cv:address"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<connector xmi:idref="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4">
+				<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_A958E5F1_29FE_4263_AEBA_5D8644A7677A">
-					<model ea_localid="1350" type="Class" name="epo:OfflineAccessProvider"/>
-					<role name="epo:definesOfflineAccessProvider" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
+					<role name="epo:hasPrimaryContactPoint" visibility="Public" targetScope="instance"/>
+					<type multiplicity="0..*" 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="3121"/>
+				<model ea_localid="1619"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating an AccessTerm has an OfflineAccessProvider."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesOfflineAccessProvider"/>
+				<labels rb="0..*" rt="+epo:hasPrimaryContactPoint"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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;"/>
+					<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 visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2966"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4576"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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/>
@@ -26884,10 +29525,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
-					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
-					<role name="epo:definesCatalogueReceiver" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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;"/>
@@ -26895,21 +29536,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3125"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating an AccessTerm has a CatalogueReceiver."/>
+				<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="0..*" rt="+epo:definesCatalogueReceiver"/>
+				<labels rb="0..1" rt="+epo:hasBuyerLegalType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<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/>
@@ -26919,9 +29558,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A">
-					<model ea_localid="917" type="Class" name="epo:PlannedProcurementPart"/>
-					<role name="epo:refersToPlannedPart" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -26930,46 +29569,47 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2602"/>
+				<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:refersToPlannedPart"/>
+				<labels rb="0..*" rt="+epo:hasTaxIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F1286B9A_905F_403f_B180_ECBF0307105F">
-				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
-					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
+			<connector xmi:idref="EAID_0DF6152A_D2C0_4f8c_A6A9_A94ADE3ECB16">
+				<source xmi:idref="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959">
+					<model ea_localid="2898" 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_1FF5173E_4940_44db_A1A0_C190337F6440">
-					<model ea_localid="967" type="Enumeration" name="at-voc:communication-justification"/>
-					<role name="epo:hasDocumentRestrictionJustification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target 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="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="2996"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="An explanation about the reasons why some procurement documents are restricted.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-707	 Documents Restricted Justification.&#xA;&#xA;WG Approval 09/03/2021&#xA;"/>
+				<model ea_localid="4436"/>
+				<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:hasDocumentRestrictionJustification"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -27655,42 +30295,7 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6">
-				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role visibility="Public" targetScope="instance"/>
-					<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_E84B97D8_2656_498d_B584_D95C2DBBD7A1">
-					<model ea_localid="852" type="Class" name="foaf:Agent"/>
-					<role name="epo:playedBy" 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="2549"/>
-				<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:playedBy"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B">
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -27702,148 +30307,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
-					<role name="epo:contextualisedBy" 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="3070"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The place of the AgentInRole in the procurement is expressed by a ProcurementObject."/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:contextualisedBy"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
-				<source 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="false"/>
-					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<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="1560"/>
-				<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_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo-not:refersToRole" 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="3196"/>
-				<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-not:refersToRole"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
-				<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;Owned=0;Navigable=Non-Navigable;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:announcesRole" 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="4482"/>
-				<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:announcesRole"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:announcesRole" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
+					<model ea_localid="2668" type="Class" name="cv:Channel"/>
+					<role name="epo:exposesChannel" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -27852,68 +30318,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4479"/>
+				<model ea_localid="4113"/>
 				<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:announcesRole"/>
+				<labels rb="0..*" rt="+epo:exposesChannel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+			<connector xmi:idref="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914">
+				<source xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
 					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:announcesRole" 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="4475"/>
-				<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:announcesRole"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
-				<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;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo-not:announcesRole" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
+					<role name="epo:hasContactPointInRole" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -27922,56 +30353,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2609"/>
-				<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-not:announcesRole"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:announcesRole" 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="2399"/>
+				<model ea_localid="1620"/>
 				<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:announcesRole"/>
+				<labels rb="0..*" rt="+epo:hasContactPointInRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B">
-				<source xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
-					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+			<connector xmi:idref="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE">
+				<source xmi:idref="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D">
+					<model ea_localid="3088" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -27992,147 +30388,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3397"/>
-				<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_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:refersToRole" 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="4652"/>
-				<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:refersToRole"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
-				<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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
-					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
-					<role name="epo:announcesRole" 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="4653"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="4753"/>
+				<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:announcesRole"/>
-				<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"/>
-					<role visibility="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="2258"/>
-				<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_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B">
-				<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/>
-					<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="4025"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -28141,9 +30399,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094">
-				<source xmi:idref="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D">
-					<model ea_localid="1332" type="Class" name="epo:EnvironmentalProtectionInformationProvider"/>
+			<connector xmi:idref="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527">
+				<source 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/>
@@ -28153,8 +30411,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
-					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28164,7 +30422,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2260"/>
+				<model ea_localid="1560"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28175,145 +30433,149 @@
 				<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"/>
+			<connector xmi:idref="EAID_49B0A22A_438E_4ee3_8C70_92C7E2AD60DC">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<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"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo-not:refersToRole" 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="3357"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3196"/>
+				<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-not:refersToRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F">
-				<source xmi:idref="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB">
-					<model ea_localid="2567" type="Class" name="epo-ful:FreightForwarder"/>
+			<connector xmi:idref="EAID_670AED44_E69C_416d_988A_2D1D02E4692C">
+				<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_2713F23E_8090_434d_B7BD_BF404238BDB5">
-					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:announcesRole" 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="3957"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4482"/>
+				<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:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1">
-				<source xmi:idref="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D">
-					<model ea_localid="1331" type="Class" name="epo:EmploymentInformationProvider"/>
+			<connector xmi:idref="EAID_67CCA39E_1E30_4142_9536_906052B9AABC">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<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"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:announcesRole" 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="2259"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4479"/>
+				<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:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4">
-				<source xmi:idref="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184">
-					<model ea_localid="2568" type="Class" name="epo-ful:Notifier"/>
+			<connector xmi:idref="EAID_8922E99F_335A_40fc_AD89_A9564A5F5F61">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<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"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:announcesRole" 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="3956"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4475"/>
+				<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:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
-				<source xmi:idref="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D">
-					<model ea_localid="923" type="Class" name="epo:ProcedureTerm"/>
+			<connector xmi:idref="EAID_91CB9CAD_CC6F_4c97_B4AA_B8C9088E4284">
+				<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/>
@@ -28323,9 +30585,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
-					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
-					<role name="epo:definesInformationProvider" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo-not:announcesRole" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -28334,55 +30596,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3441"/>
+				<model ea_localid="2609"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ProcedureTerm has an information provider."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:definesInformationProvider"/>
+				<labels rb="0..*" rt="+epo-not:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_30D2C78D_A7B9_4e68_B307_2638D65D637C">
-				<source xmi:idref="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7">
-					<model ea_localid="3035" type="Class" name="epo:AwardCriteriaSummary"/>
+			<connector xmi:idref="EAID_AB476D87_C25E_439e_AA92_BB00BFD1DB22">
+				<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;"/>
+					<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_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:announcesRole" 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="4637"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2399"/>
+				<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:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E006DB35_535D_4444_B447_89D7A813874C">
-				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
-					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
+			<connector xmi:idref="EAID_AE2DB18B_3AF3_4133_AE88_A4F91623D21B">
+				<source 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/>
@@ -28392,8 +30655,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28403,7 +30666,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1694"/>
+				<model ea_localid="3397"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28414,9 +30677,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19">
-				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
-					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
+			<connector xmi:idref="EAID_B82C6E19_FB7C_453e_9B40_0A74A0E00195">
+				<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/>
@@ -28426,10 +30689,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8">
-					<model ea_localid="965" type="Enumeration" name="at-voc:award-criterion-type"/>
-					<role name="epo:hasAwardCriterionType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:refersToRole" 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;"/>
@@ -28437,19 +30700,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1689"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Category of award criterion.&#xA;&#xA;"/>
+				<model ea_localid="4652"/>
+				<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:hasAwardCriterionType"/>
+				<labels rb="0..*" rt="+epo:refersToRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0">
-				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
-					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
+			<connector xmi:idref="EAID_D19EA23B_3707_4f38_8E54_F2D9BE08A114">
+				<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/>
@@ -28459,10 +30724,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1">
-					<model ea_localid="983" type="Enumeration" name="at-voc:number-fixed"/>
-					<role name="epo:hasFixedValueType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6">
+					<model ea_localid="1326" type="Class" name="epo:AgentInRole"/>
+					<role name="epo:announcesRole" 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;"/>
@@ -28470,19 +30735,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1688"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The method to interpret the fixed value as pertaining to a total or unit.&#xA;&#xA;WG Approval 17/09/2019&#xA;&#xA;"/>
+				<model ea_localid="4653"/>
+				<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:hasFixedValueType"/>
+				<labels rb="0..*" rt="+epo:announcesRole"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA">
-				<source xmi:idref="EAID_C932A7D1_D54B_40f1_92A7_459C07235810">
-					<model ea_localid="1469" type="Class" name="epo:AwardEvaluationTerm"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28492,8 +30759,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0C735489_15DC_40a7_A94E_A9202738B188">
-					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
+				<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/>
@@ -28503,7 +30770,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2528"/>
+				<model ea_localid="2258"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28514,9 +30781,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BD823F50_7A3D_4832_8C19_876392639DF8">
-				<source xmi:idref="EAID_620C5C3F_3C72_4897_A377_32156A5461E3">
-					<model ea_localid="1050" type="Class" name="epo:AwardingCentralPurchasingBody"/>
+			<connector xmi:idref="EAID_10602E2D_EE49_4483_BF7D_068AAD2C5033">
+				<source xmi:idref="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1">
+					<model ea_localid="1951" type="Class" name="epo:Certifier"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28526,8 +30793,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC">
-					<model ea_localid="863" type="Class" name="epo:CentralPurchasingBody"/>
+				<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/>
@@ -28537,7 +30804,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2264"/>
+				<model ea_localid="4829"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28548,112 +30815,77 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+			<connector xmi:idref="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B">
+				<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/>
 					<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_B63C4BE8_86E2_494f_AB88_882E3568B3F0">
-					<model ea_localid="999" type="Enumeration" name="at-voc:winner-selection-status"/>
-					<role name="epo:hasAwardStatus" 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="2583"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Indicates whether the lot is awarded, not awarded or still open.&#xA;WG Approval 03/12/2019&#xA;&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasAwardStatus"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_547A511C_F377_4405_82EA_14ABA20458B6">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+				<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="false"/>
-					<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:hasAwardedValue" 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="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1462"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4025"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The value of the procurement provided by the Award Decision.&#xA;&#xA;Additional Information:&#xA;Different cases of awarded values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum awarded value.&#xA;&#xA;WG Approval 10/12/2019"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasAwardedValue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+			<connector xmi:idref="EAID_5C021DF8_F1E3_453e_8D40_2B84F1680094">
+				<source xmi:idref="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D">
+					<model ea_localid="1332" type="Class" name="epo:EnvironmentalProtectionInformationProvider"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
-					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
-					<role name="epo:comprisesTenderAwardOutcome" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2503"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2260"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Incorporates TenderAwardOutcome."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:comprisesTenderAwardOutcome"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28663,8 +30895,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481">
-					<model ea_localid="1719" type="Class" name="epo:ContextualProjection"/>
+				<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/>
@@ -28674,7 +30906,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4757"/>
+				<model ea_localid="3357"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28685,77 +30917,77 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+			<connector xmi:idref="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F">
+				<source xmi:idref="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB">
+					<model ea_localid="2567" type="Class" name="epo-ful:FreightForwarder"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_D46376EC_6B98_4926_8627_A594E6819D78">
-					<model ea_localid="981" type="Enumeration" name="at-voc:non-award-justification"/>
-					<role name="epo:hasNonAwardJustification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2584"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="On hold; Enumeration.&#xA;&#xA;&#xA;"/>
+				<model ea_localid="3957"/>
+				<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:hasNonAwardJustification"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C">
-				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+			<connector xmi:idref="EAID_92F0D316_7D2B_4855_ACB3_ECF78EC60BD1">
+				<source xmi:idref="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D">
+					<model ea_localid="1331" type="Class" name="epo:EmploymentInformationProvider"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasBargainPrice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3439"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2259"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The value of procured supplies that have used a particularly advantageous opportunity available for a very short time at a value considerably lower than normal market prices.&#xA;&#xA;WG approval 23/05/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBargainPrice"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
-				<source xmi:idref="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5">
-					<model ea_localid="3009" type="Class" name="epo:MiniCompetitionAwardOutcome"/>
+			<connector xmi:idref="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4">
+				<source 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/>
@@ -28765,8 +30997,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+				<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/>
@@ -28776,7 +31008,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4607"/>
+				<model ea_localid="3956"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -28787,9 +31019,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CF215D61_0282_4111_B11C_CBD651205C58">
-				<source xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+			<connector xmi:idref="EAID_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A">
+				<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/>
@@ -28799,9 +31031,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
-					<role name="epo:comprisesAwardOutcome" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5">
+					<model ea_localid="2111" type="Class" name="epo:AuxiliaryParty"/>
+					<role name="epo:definesInformationProvider" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -28810,21 +31042,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2833"/>
+				<model ea_localid="3441"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Incorporates AwardOutcome."/>
+				<documentation value="Relation indicating a ProcedureTerm has an information provider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:comprisesAwardOutcome"/>
+				<labels rb="0..*" rt="+epo:definesInformationProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_33CADDC4_3A87_4925_A302_795332661BE4">
+				<source xmi:idref="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C">
+					<model ea_localid="2106" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28834,8 +31066,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+				<target xmi:idref="EAID_B4F30642_373D_4195_B1E6_10198F138ED8">
+					<model ea_localid="1333" type="Class" name="epo:Awarder"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28845,9 +31077,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2999"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3394"/>
+				<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/>
@@ -28856,36 +31088,35 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
-				<source xmi:idref="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A">
-					<model ea_localid="1544" type="Class" name="epo:SubmissionStatisticalInformation"/>
+			<connector xmi:idref="EAID_BD823F50_7A3D_4832_8C19_876392639DF8">
+				<source xmi:idref="EAID_620C5C3F_3C72_4897_A377_32156A5461E3">
+					<model ea_localid="1050" type="Class" name="epo:AwardingCentralPurchasingBody"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_E7437025_771F_4143_BE33_620A29646687">
-					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
-					<role name="epo:summarisesInformationForAwardOutcome" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC">
+					<model ea_localid="863" type="Class" name="epo:CentralPurchasingBody"/>
+					<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="2797"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2264"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to submission for the given competition, either at Lot level or Mini-Competition level.&#xA;&#xA;WG approval 30/05/2023"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:summarisesInformationForAwardOutcome"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -28926,9 +31157,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3">
-				<source xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
-					<model ea_localid="856" type="Class" name="epo:Business"/>
+			<connector xmi:idref="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
+				<source xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -28938,10 +31169,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E">
-					<model ea_localid="973" type="Enumeration" name="at-voc:economic-operator-size"/>
-					<role name="epo:hasBusinessSize" 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:signsAwardDecision" 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;"/>
@@ -28949,51 +31180,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1672"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The category of the business depending on number of employees and turnover.&#xA;&#xA;Additional information:&#xA;&#xA;See Commission Recommendation of 6 May 2003 concerning the definition of micro, small and medium-sized enterprises.&#xA;&#xA;WG Approval 28/05/2020&#xA;&#xA;"/>
+				<model ea_localid="4611"/>
+				<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:hasBusinessSize"/>
+				<labels rb="0..*" rt="+epo:signsAwardDecision"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC">
-				<source xmi:idref="EAID_C5813A3B_95C1_42ef_894E_2EFBAE78D71C">
-					<model ea_localid="856" type="Class" name="epo:Business"/>
+			<connector xmi:idref="EAID_46812517_A9DA_432d_A7B8_F5FEC69BBDA5">
+				<source xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
+					<model ea_localid="857" type="Class" name="epo:Buyer"/>
 					<role visibility="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"/>
+				<target xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
+					<role name="epo:indicatesInvoiceeContactPoint" 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1673"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4274"/>
+				<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 rt="+epo:indicatesInvoiceeContactPoint"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4557D84E_2B82_485f_A14D_2E0BE4C98649">
+			<connector xmi:idref="EAID_5EC16E7A_8AD7_4cd0_B3EE_963EFE7F14CA">
 				<source xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
 					<model ea_localid="857" type="Class" name="epo:Buyer"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -29005,9 +31239,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:signsAwardDecision" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A">
+					<model ea_localid="2668" type="Class" name="cv:Channel"/>
+					<role name="epo:exposesInvoiceeChannel" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -29016,13 +31250,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4611"/>
+				<model ea_localid="4275"/>
 				<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:signsAwardDecision"/>
+				<labels rb="0..*" rt="+epo:exposesInvoiceeChannel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -29167,9 +31401,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
-				<source xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D">
-					<model ea_localid="2623" type="Class" name="epo-ful:ShipmentAgreement"/>
+			<connector xmi:idref="EAID_8B8F145A_51EA_4206_A62F_C9887535362E">
+				<source xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30">
+					<model ea_localid="887" type="Class" name="epo:EvaluationBoard"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -29181,30 +31415,30 @@
 				</source>
 				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
 					<model ea_localid="857" type="Class" name="epo:Buyer"/>
-					<role name="epo-ful:agreedByBuyer" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+					<role name="epo:isAppointedBy" visibility="Public" targetScope="instance"/>
+					<type multiplicity="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="4263"/>
+				<model ea_localid="1660"/>
 				<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-ful:agreedByBuyer"/>
+				<labels rb="1" rt="+epo:isAppointedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9">
-				<source xmi:idref="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
+			<connector xmi:idref="EAID_8C74AF3F_89A0_4039_8257_A68F3DC30CC3">
+				<source xmi:idref="EAID_070CDA0E_DED6_4ed8_80D1_768357F1472D">
+					<model ea_localid="2623" type="Class" name="epo-ful:ShipmentAgreement"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -29216,8 +31450,8 @@
 				</source>
 				<target xmi:idref="EAID_96B284C4_E759_4bad_9655_04521F703750">
 					<model ea_localid="857" type="Class" name="epo:Buyer"/>
-					<role name="epo:involvesBuyer" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+					<role name="epo-ful:agreedByBuyer" 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;"/>
@@ -29225,13 +31459,13 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2509"/>
+				<model ea_localid="4263"/>
 				<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:involvesBuyer"/>
+				<labels rb="1..*" rt="+epo-ful:agreedByBuyer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -29272,41 +31506,6 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE">
-				<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;"/>
-					<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:isResponsibilityOfBuyer" 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="&#xA;"/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="3157"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="The buyer in charge of the procedure.&#xA;&#xA;Additional Information:&#xA;In case there are multiple buyers, it may be the case that one or more buyers are in charge of the procedure.&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isResponsibilityOfBuyer"/>
-				<extendedProperties virtualInheritance="0"/>
-				<style/>
-				<xrefs/>
-				<tags/>
-			</connector>
 			<connector xmi:idref="EAID_D2FAB429_5D16_4718_A790_6F3EB673B453">
 				<source xmi:idref="EAID_E79A87A0_F565_4e88_B82D_D1167BEF6A0C">
 					<model ea_localid="2010" type="Class" name="epo-ord:Order"/>
@@ -29549,9 +31748,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -29563,8 +31762,8 @@
 				</source>
 				<target xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
 					<model ea_localid="1049" type="Class" name="epo:CatalogueProvider"/>
-					<role name="epo:specifiesCatalogueProvider" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+					<role name="epo:definesCatalogueProvider" 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;"/>
@@ -29572,19 +31771,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3156"/>
+				<model ea_localid="3124"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating an AccessTerm has a CatalogueProvider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:specifiesCatalogueProvider"/>
+				<labels rb="0..*" rt="+epo:definesCatalogueProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+			<connector xmi:idref="EAID_9BD8157E_3EB6_44da_84E5_92EF1E2753B3">
 				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
 					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
 					<role visibility="Public" targetScope="instance"/>
@@ -29596,9 +31795,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
-					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
-					<role name="epo:specifiesCatalogueReceiver" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6">
+					<model ea_localid="1049" type="Class" name="epo:CatalogueProvider"/>
+					<role name="epo:specifiesCatalogueProvider" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -29607,55 +31806,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3452"/>
+				<model ea_localid="3156"/>
 				<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:specifiesCatalogueReceiver"/>
+				<labels rb="0..1" rt="+epo:specifiesCatalogueProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB">
-				<source xmi:idref="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B">
-					<model ea_localid="1892" type="Class" name="epo:ConcessionContract"/>
+			<connector xmi:idref="EAID_52428053_29BF_4efe_807B_B6FA3BB29BF5">
+				<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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
+					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
+					<role name="epo:specifiesCatalogueReceiver" 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="3075"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3452"/>
+				<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:specifiesCatalogueReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
-				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+			<connector xmi:idref="EAID_D7D6284A_096F_4112_989F_32AD38804C63">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -29665,10 +31865,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:hasConcessionEstimatedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62">
+					<model ea_localid="1048" type="Class" name="epo:CatalogueReceiver"/>
+					<role name="epo:definesCatalogueReceiver" 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;"/>
@@ -29676,68 +31876,67 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4634"/>
+				<model ea_localid="3125"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating an AccessTerm has a CatalogueReceiver."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasConcessionEstimatedValue"/>
+				<labels rb="0..*" rt="+epo:definesCatalogueReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_91D18452_424C_4f36_8E1E_BF993F4D765A">
-				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasEstimatedUserConcessionRevenue" 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="1490"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1593"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The estimated revenue coming from the use of the concession.&#xA;&#xA;Additional Information:&#xA;Revenues are for example fees and fines. For example, the fees and fines coming from the cars using a motorway.&#xA;&#xA;This corresponds to BT-162 in eForms.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEstimatedUserConcessionRevenue"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C35EEDCE_0633_482d_BA4A_4553057B7C23">
-				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
-					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasEstimatedBuyerConcessionRevenue" 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:needsToBeAWinner" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -29746,55 +31945,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1487"/>
+				<model ea_localid="4278"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The expected payments made by the buyer to the economic operator awarded the concession that are not directly related to the use of the concession.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;For example the public buyer pays a yearly fee to provide a ticketing solution to the public.  The fee the public pays for every ticket sold through the solution is not included in this estimation but in the estimation of the user concession revenue.&#xA;&#xA;This corresponds to BT-160 in eForms.&#xA;&#xA;WG Approval 07/01/2020"/>
+				<documentation value="The Contractor must be a Winner.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEstimatedBuyerConcessionRevenue"/>
+				<labels rb="0..1" rt="+epo:needsToBeAWinner"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F08185C3_E8E6_4c0c_A2A4_E3D451902197">
-				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+			<connector xmi:idref="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="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_29C3D7E4_ECAE_4773_828D_74E22D192897">
-					<model ea_localid="1648" type="Class" name="epo:Estimate"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
+					<model ea_localid="871" type="Class" name="epo:Contractor"/>
+					<role name="epo:signedByContractor" 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="3249"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2496"/>
+				<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:signedByContractor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_47C8CD49_71D8_4ef9_919E_87DD36154F85">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<connector xmi:idref="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -29804,10 +32004,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
-					<role name="epo:foreseesConcession" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
+					<model ea_localid="871" type="Class" name="epo:Contractor"/>
+					<role name="epo:bindsContractor" 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;"/>
@@ -29815,90 +32015,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3248"/>
+				<model ea_localid="3126"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Provides legal constraint on the Contractor."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:foreseesConcession"/>
+				<labels rb="0..*" rt="+epo:bindsContractor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_F9D16671_87A9_411b_B205_013259F2908D">
+				<source xmi:idref="EAID_F11BD59C_AA64_47f2_89FC_FCAA78104C30">
+					<model ea_localid="887" type="Class" name="epo:EvaluationBoard"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_67406FC0_EABC_4d83_B727_BC88B30CF43C">
-					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
-					<role name="epo:foreseesConcession" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896">
+					<model ea_localid="3042" type="Class" name="epo:JuryMember"/>
+					<role name="epo:hasEvaluationMember" 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="An agent involved in an evaluation board.&#xA;WG approval 14/09/2021"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4633"/>
+				<model ea_localid="1548"/>
 				<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:foreseesConcession"/>
+				<labels rb="1..*" rt="+epo:hasEvaluationMember"/>
 				<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"/>
+			<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/>
 					<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_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
-					<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="3960"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:definesMediator"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1DAFA4D2_EE54_4246_A132_FC5F510A59ED">
-				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-					<model ea_localid="1811" type="Class" name="epo:NoticeChangeInformation"/>
+			<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/>
@@ -29908,8 +32109,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -29919,7 +32120,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4767"/>
+				<model ea_localid="1363"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -29930,9 +32131,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_356035E1_7546_4bda_9685_286F5A33ED5A">
-				<source xmi:idref="EAID_4F81C811_16F5_4332_BAEA_9843D331872F">
-					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
+			<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/>
@@ -29942,8 +32143,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -29953,7 +32154,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2843"/>
+				<model ea_localid="3523"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -29964,43 +32165,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_450148E7_98E2_4642_9EE2_203242F5A4D8">
-				<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"/>
+			<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_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
-					<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="3182"/>
+				<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_5ACD6A3D_7AA3_4504_8B13_015B01092BC2">
-				<source xmi:idref="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2">
-					<model ea_localid="1654" type="Class" name="epo:LotGroupAwardInformation"/>
+			<connector xmi:idref="EAID_8810653B_DB4F_443e_9499_790E7FC8DE86">
+				<source xmi:idref="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6">
+					<model ea_localid="2062" type="Class" name="epo:Invoicer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30010,8 +32211,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30021,7 +32222,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2831"/>
+				<model ea_localid="3353"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30032,9 +32233,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0">
-				<source xmi:idref="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248">
-					<model ea_localid="1655" type="Class" name="epo:NoticeAwardInformation"/>
+			<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/>
@@ -30044,8 +32245,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30055,7 +32256,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2830"/>
+				<model ea_localid="1384"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30066,9 +32267,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A">
-				<source xmi:idref="EAID_3E3C6304_E823_43a1_8914_2046342E8F96">
-					<model ea_localid="3085" type="Class" name="epo:NonPublishedInformation"/>
+			<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/>
@@ -30078,8 +32279,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30089,7 +32290,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4771"/>
+				<model ea_localid="4057"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30100,9 +32301,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316">
-				<source xmi:idref="EAID_29C3D7E4_ECAE_4773_828D_74E22D192897">
-					<model ea_localid="1648" type="Class" name="epo:Estimate"/>
+			<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/>
@@ -30112,8 +32313,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30123,7 +32324,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4768"/>
+				<model ea_localid="3265"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30134,9 +32335,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9">
-				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+			<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/>
@@ -30146,8 +32347,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30157,7 +32358,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3047"/>
+				<model ea_localid="3264"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30168,9 +32369,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD">
-				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
-					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+			<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/>
@@ -30180,8 +32381,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0">
-					<model ea_localid="1718" type="Class" name="epo:ContextSpecificDescription"/>
+				<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/>
@@ -30191,7 +32392,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4772"/>
+				<model ea_localid="2725"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30202,9 +32403,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C3A99946_EA61_4bb4_BBB2_994F422EB5DD">
-				<source xmi:idref="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
-					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
+			<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/>
@@ -30214,8 +32415,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_B2165393_B24C_4dd7_A2E2_DE976E538481">
-					<model ea_localid="1719" type="Class" name="epo:ContextualProjection"/>
+				<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/>
@@ -30225,7 +32426,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2299"/>
+				<model ea_localid="1358"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -30236,9 +32437,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30248,10 +32449,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:hasLotReference" visibility="Public" targetScope="instance"/>
-					<type multiplicity="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;"/>
@@ -30259,21 +32460,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2871"/>
+				<model ea_localid="4058"/>
 				<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"/>
+				<labels rb="0..*" rt="+epo:distributesOffer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<connector xmi:idref="EAID_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30283,10 +32484,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
-					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
-					<role name="epo:specifiesDeliverable" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A">
+					<model ea_localid="1350" type="Class" name="epo:OfflineAccessProvider"/>
+					<role name="epo:definesOfflineAccessProvider" 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;"/>
@@ -30294,21 +32495,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4452"/>
+				<model ea_localid="3121"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating an AccessTerm has an OfflineAccessProvider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:specifiesDeliverable"/>
+				<labels rb="0..1" rt="+epo:definesOfflineAccessProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30318,9 +32519,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:hasContractValue" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -30329,21 +32530,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4456"/>
+				<model ea_localid="2544"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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..1" rt="+epo:hasContractValue"/>
+				<labels rb="0..1" rt="+epo:definesParticipationRequestProcessor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30353,10 +32554,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
-					<role name="epo:isSubjectToContractSpecificTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30364,21 +32565,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4280"/>
+				<model ea_localid="2543"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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..*" rt="+epo:isSubjectToContractSpecificTerm"/>
+				<labels rb="0..1" rt="+epo:definesParticipationRequestReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<connector xmi:idref="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30388,10 +32589,10 @@
 					<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_C0F5DE45_CA08_46dd_AD44_E7EF577A809D">
+					<model ea_localid="1338" type="Class" name="epo:PaymentExecutor"/>
+					<role name="epo:definesPaymentExecutor" 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;"/>
@@ -30399,21 +32600,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4694"/>
+				<model ea_localid="2547"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<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 value="Relation indicating a ContractTerm has a PaymentExecutor."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isFundedBy"/>
+				<labels rb="0..1" rt="+epo:definesPaymentExecutor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_75F02E69_A9AF_47c5_B217_F52FFB1CAD53">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<connector xmi:idref="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30423,10 +32624,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
-					<model ea_localid="871" type="Class" name="epo:Contractor"/>
-					<role name="epo:signedByContractor" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E">
+					<model ea_localid="1349" type="Class" name="epo:ProcurementProcedureInformationProvider"/>
+					<role name="epo:definesProcurementProcedureInformationProvider" 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;"/>
@@ -30434,21 +32635,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2496"/>
+				<model ea_localid="3120"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating an AccessTerm has a ProcurementProcedureInformationProvider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:signedByContractor"/>
+				<labels rb="0..1" rt="+epo:definesProcurementProcedureInformationProvide"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_97C17D51_4DF6_4979_B308_C0F08C743DCF">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30458,8 +32659,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -30469,9 +32670,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4469"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4814"/>
+				<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/>
@@ -30480,44 +32681,42 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
 					<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_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
-					<model ea_localid="1698" type="Class" name="epo:Duration"/>
-					<role name="epo:hasEstimatedDuration" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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="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="1610"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating a Contract has an estimated Duration.&#xA;&#xA;Additional Information&#xA;&#xA;When the Lot uses a Technique the contract estimated duration applies to the Technique.&#xA;"/>
+				<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..1" rt="+epo:hasEstimatedDuration"/>
+				<labels rb="0..*" rt="+epo:hasReviewBodyType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DDBC2835_CD1A_40df_9C2D_9222DAB14E19">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30527,10 +32726,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30538,21 +32737,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4703"/>
+				<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..1" rt="+epo:hasPurpose"/>
+				<labels rb="0..*" rt="+epo:definesReviewer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EC8CA809_26BC_46b1_A885_D5B3B1D5960A">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+			<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/>
@@ -30562,10 +32761,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7">
-					<model ea_localid="871" type="Class" name="epo:Contractor"/>
-					<role name="epo:bindsContractor" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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;"/>
@@ -30573,69 +32772,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3126"/>
+				<model ea_localid="4755"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Provides legal constraint on the Contractor."/>
+				<documentation value="Relation indicating a ReviewTerm has a ReviewProcedureInformationProvider."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:bindsContractor"/>
+				<labels rb="0..1" rt="+epo:definesReviewProcedureInformationProvider"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
-				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role visibility="Public"/>
-					<type aggregation="none"/>
-					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
-					<style value="AllowDuplicates=0;Derived=0;Navigable=Non-Navigable;Owned=0;Union=0;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</source>
-				<target xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
+			<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 name="epo:includesTender" 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;"/>
-					<documentation/>
-					<xrefs/>
-					<tags/>
-				</target>
-				<model ea_localid="1749"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Additional information:&#xA;This corresponds in eForms to BT-3202	 Contract Tender Identifier.&#xA;"/>
-				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:includesTender"/>
-				<extendedProperties/>
-				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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="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;"/>
@@ -30643,56 +32807,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4636"/>
+				<model ea_localid="1557"/>
 				<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:hasTaxInformation"/>
+				<labels rb="0..*" rt="+epo:specifiesSubcontractors"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1326915C_1564_403a_A96E_65DCEC3F641A">
-				<source xmi:idref="EAID_904F1F22_F927_4cdc_9DC0_B20FB6460524">
-					<model ea_localid="1079" type="Class" name="epo-not:CompletionNotice"/>
+			<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:announcesCompletionOfContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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="4484"/>
+				<model ea_localid="1533"/>
 				<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:announcesCompletionOfContract"/>
+				<labels rb="0..1" rt="+epo:substantiatesExclusionGround"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_25DE37BE_E478_4159_8F53_7F49CAD18053">
-				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+			<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/>
@@ -30702,10 +32866,10 @@
 					<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="1" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30713,34 +32877,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2838"/>
+				<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="1" rt="+epo:refersToContract"/>
+				<labels rb="0..1" rt="+epo:needsToBeATenderer"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
-				<source xmi:idref="EAID_71373AFD_6871_4946_B921_97A716439257">
-					<model ea_localid="1078" type="Class" name="epo-not:ContractModificationNotice"/>
+			<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"/>
-					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:refersToContractToBeModified" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30748,55 +32912,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1605"/>
+				<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="1" rt="+epo:refersToContractToBeModified"/>
+				<labels rb="0..1" rt="+epo:isSubmitedBy"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3675E499_10A4_457e_9458_83E0C40CEC9A">
-				<source xmi:idref="EAID_0541321A_FDA1_4521_943D_6D37C8C9B3F8">
-					<model ea_localid="932" type="Class" name="epo:PurchaseContract"/>
+			<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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
-					<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="1409"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:definesTenderProcessor"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
-				<source xmi:idref="EAID_D847D616_70DB_473a_A2A4_6665F938474C">
-					<model ea_localid="1076" type="Class" name="epo-not:DirectAwardPrenotificationNotice"/>
+			<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/>
@@ -30806,10 +32971,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:announcesContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30817,21 +32982,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4645"/>
+				<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..*" rt="+epo:announcesContract"/>
+				<labels rb="0..1" rt="+epo:definesTenderReceiver"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
-				<source xmi:idref="EAID_F3D8C3F4_E1D4_425d_A23F_1DCF65619AE2">
-					<model ea_localid="1077" type="Class" name="epo-not:ResultNotice"/>
+			<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/>
@@ -30841,10 +33006,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:announcesContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -30852,90 +33017,90 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4638"/>
+				<model ea_localid="2497"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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..*" rt="+epo:announcesContract"/>
+				<labels rb="0..1" rt="+epo:indicatesAwardToWinner"/>
 				<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"/>
+			<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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
-					<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="4573"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:issuedByCertifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
-				<source xmi:idref="EAID_D64CB6B9_27B3_4bb4_8F05_5126320D2A7F">
-					<model ea_localid="3087" type="Class" name="epo-con:ContractAmendment"/>
+			<connector xmi:idref="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463">
+				<source xmi:idref="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658">
+					<model ea_localid="2097" 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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo:amendsContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695">
+					<model ea_localid="2028" type="Class" name="epo-ord:Consignee"/>
+					<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="4721"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="3392"/>
+				<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="1" rt="+epo:amendsContract"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46">
-				<source xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE">
-					<model ea_localid="3002" type="Class" name="epo:DirectContract"/>
+			<connector xmi:idref="EAID_6B97ADD1_0B83_48d4_9B1E_CDA9640E018F">
+				<source xmi:idref="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C">
+					<model ea_localid="2104" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30945,8 +33110,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+				<target xmi:idref="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6">
+					<model ea_localid="2062" type="Class" name="epo:Invoicer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -30956,9 +33121,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4594"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3380"/>
+				<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/>
@@ -30967,44 +33132,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A79DC2F8_C373_4894_AF6D_C4779365607A">
-				<source xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94">
-					<model ea_localid="2360" type="Class" name="epo-ord:ContractInformation"/>
+			<connector xmi:idref="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B">
+				<source xmi:idref="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30">
+					<model ea_localid="2103" 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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo-ord:concernsContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<target 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/>
 					<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="3641"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="3381"/>
+				<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="1" rt="+epo-ord:concernsContract"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A">
-				<source xmi:idref="EAID_65F57F92_CF04_4a75_8815_FCBD5BE7E029">
-					<model ea_localid="896" type="Class" name="epo:FrameworkAgreement"/>
+			<connector xmi:idref="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5">
+				<source xmi:idref="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA">
+					<model ea_localid="2098" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -31014,8 +33178,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
+				<target xmi:idref="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E">
+					<model ea_localid="2004" type="Class" name="epo-ord:Originator"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -31025,9 +33189,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1528"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="3391"/>
+				<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/>
@@ -31036,9 +33200,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BC94D054_08DB_4bb5_A279_498213B45F8E">
-				<source xmi:idref="EAID_3EACA7BF_9363_44c5_81FF_2C5D1C5F37D0">
-					<model ea_localid="1056" type="Class" name="epo-cat:Catalogue"/>
+			<connector xmi:idref="EAID_A4228FCF_2B3C_44e6_BD17_379180274988">
+				<source xmi:idref="EAID_33E9269C_0B96_4b38_A129_C30771A9833F">
+					<model ea_localid="866" type="Class" name="cpov:ContactPoint"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -31048,9 +33212,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo-cat:isSubordinatedToContract" 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:address" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -31059,21 +33223,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1759"/>
+				<model ea_localid="4618"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:isSubordinatedToContract"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+cv:address"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
-				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
-					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
+			<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/>
@@ -31083,10 +33247,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
-					<model ea_localid="867" type="Class" name="epo:Contract"/>
-					<role name="epo-ord:implementsContract" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -31094,21 +33258,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3259"/>
+				<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..1" rt="+epo-ord:implementsContract"/>
+				<labels rb="0..*" rt="+epo:hasEndpointIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9">
-				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+			<connector xmi:idref="EAID_06D187DF_9192_4549_BE01_736C22D89AEA">
+				<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/>
@@ -31118,9 +33282,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:providesContractTotalPenaltyValue" 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"/>
@@ -31129,21 +33293,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2841"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="&#xA;Additional Information:&#xA;This corresponds to BT-782 in eForms. &#xA;"/>
+				<model ea_localid="4709"/>
+				<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:providesContractTotalPenaltyValue"/>
+				<labels rb="0..1" rt="+epo:hasCountryCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605">
-				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+			<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/>
@@ -31153,10 +33315,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:describesLotCompletion" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -31164,21 +33326,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2839"/>
+				<model ea_localid="4713"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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="+epo:describesLotCompletion"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
-				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
-					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
+			<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -31188,9 +33350,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:providesContractTotalPaymentValue" visibility="Public" targetScope="instance"/>
+				<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" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -31199,55 +33361,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2840"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Additional Information:&#xA;This corresponds to BT-779 in eForms. "/>
+				<model ea_localid="4708"/>
+				<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:providesContractTotalPaymentValue"/>
+				<labels rb="0..1" rt="+epo:hasNutsCode"/>
 				<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"/>
+			<connector xmi:idref="EAID_C70B3C1A_A0BD_494b_BEE6_89F708783872">
+				<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;"/>
+					<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_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..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="1593"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4705"/>
+				<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="+locn:address"/>
 				<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"/>
+			<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/>
@@ -31257,9 +33418,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3">
-					<model ea_localid="962" type="Class" name="epo:Winner"/>
-					<role name="epo:needsToBeAWinner" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -31268,157 +33429,161 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4278"/>
+				<model ea_localid="4712"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The Contractor must be a Winner.&#xA;"/>
+				<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="+epo:needsToBeAWinner"/>
+				<labels rb="0..1" rt="+locn:geographicIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
-				<source xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
+			<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"/>
 					<role visibility="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_2424C22E_B54F_4b6f_BA47_E78DE21C76DE">
+					<model ea_localid="1483" type="Class" name="locn:Geometry"/>
+					<role name="locn:geometry" 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="3074"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4704"/>
+				<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="+locn:geometry"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2">
-				<source xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
-					<model ea_localid="948" type="Class" name="epo:SubcontractTerm"/>
+			<connector xmi:idref="EAID_6A549AF3_1E2A_4cd7_9F26_8CD173F2F4F7">
+				<source xmi:idref="EAID_EA36CA1F_5963_4ff6_86BE_1ACC9D34E843">
+					<model ea_localid="2786" type="Class" name="epo-ord:DeliveryAgreement"/>
 					<role visibility="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_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo-ord:specifiesDeliveryAgreementLocation" 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="2311"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4716"/>
+				<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:specifiesDeliveryAgreementLocation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0">
+			<connector xmi:idref="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
 				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
 					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="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_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo:definesSpecificPlaceOfPerformance" 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="2971"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4706"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ContractTerm has a specific place of performance."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:definesSpecificPlaceOfPerformance"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_D8FEF002_D274_4157_BCA8_CFEC07ED34AE">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo-ord:specifiesPlaceOfDelivery" 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="4723"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4717"/>
+				<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:specifiesPlaceOfDelivery"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0">
-				<source xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+			<connector xmi:idref="EAID_DF35A308_9DDF_4d5b_980E_9D85403496D0">
+				<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/>
@@ -31428,10 +33593,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
-					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
-					<role name="epo:foreseesContractSpecificTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo-cat:hasDeliveryLocation" 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;"/>
@@ -31439,21 +33604,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3072"/>
+				<model ea_localid="4714"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Location delivery area where the Item can be ordered to the given price.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:foreseesContractSpecificTerm"/>
+				<labels rb="0..1" rt="+epo-cat:hasDeliveryLocation"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<connector xmi:idref="EAID_F53AAA5F_2719_4ea3_8E3F_AB7111A1C8C8">
+				<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/>
@@ -31463,9 +33628,9 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D">
-					<model ea_localid="1338" type="Class" name="epo:PaymentExecutor"/>
-					<role name="epo:definesPaymentExecutor" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7">
+					<model ea_localid="3072" type="Class" name="dct:Location"/>
+					<role name="epo-ful:specifiesPlaceOfDespatch" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -31474,54 +33639,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2547"/>
+				<model ea_localid="4715"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ContractTerm has a PaymentExecutor."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesPaymentExecutor"/>
+				<labels rb="0..1" rt="+epo-ful:specifiesPlaceOfDespatch"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
-					<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_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B">
-					<model ea_localid="987" type="Enumeration" name="at-voc:other-place-service"/>
-					<role name="epo:hasBroadPlaceOfPerformance" 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="1591"/>
+				<model ea_localid="2568"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Geopolitical zone where the contract can be executed.&#xA;&#xA;Additional Information&#xA;&#xA;Used for setting restrictions that cannot be established with one country code or a geographical zone identifier (like NUTS), because they have a broader scope (geographical, economic, political, other).&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBroadPlaceOfPerformance"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..1" rt="+epo:hasNutsCode"/>
+				<extendedProperties/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A01E8ADE_1698_4353_BEDB_63334B745ECB">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<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/>
@@ -31531,9 +33696,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:definesContractDuration" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -31542,21 +33707,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3250"/>
+				<model ea_localid="3024"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ContractTerm has a Duration."/>
+				<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="+epo:definesContractDuration"/>
+				<labels rb="0..1" rt="+locn:addressID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<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/>
@@ -31566,9 +33731,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:hasEInvoicingPermission" 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"/>
@@ -31577,31 +33742,31 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4434"/>
+				<model ea_localid="1707"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<documentation value="&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEInvoicingPermission"/>
+				<labels rb="0..1" rt="+epo:hasCountryCode"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<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/>
 					<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_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
-					<model ea_localid="964" type="Enumeration" name="at-voc:applicability"/>
-					<role name="epo:hasReservedExecution" visibility="Public" targetScope="instance"/>
+				<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"/>
@@ -31610,155 +33775,158 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4473"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="1704"/>
+				<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"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasReservedExecution"/>
+				<labels rb="0..1" rt="+epo:definesOpeningPlace"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<connector xmi:idref="EAID_285BF543_AB60_4346_9E70_090B7DE95623">
+				<source xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_499A4BAD_6188_4f6f_B5BC_9B871A4349B8">
-					<model ea_localid="968" type="Enumeration" name="at-voc:contract-nature"/>
-					<role name="epo:hasContractNatureType" 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="1404"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Subject of the acquisition.&#xA;&#xA;WG Approval 11/06/2020&#xA;&#xA;"/>
+				<model ea_localid="3074"/>
+				<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:hasContractNatureType"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			<connector xmi:idref="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2">
+				<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/>
 					<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_499A4BAD_6188_4f6f_B5BC_9B871A4349B8">
-					<model ea_localid="968" type="Enumeration" name="at-voc:contract-nature"/>
-					<role name="epo:hasAdditionalContractNature" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
+					<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="1403"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Additional type of acquisition taken into consideration in the contract.&#xA;&#xA;WG Approval 11/06/2020&#xA;&#xA;"/>
+				<model ea_localid="2311"/>
+				<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:hasAdditionalContractNature"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
-			</connector>
-			<connector xmi:idref="EAID_F593B546_502A_413a_8694_914903478877">
-				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
-					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
+			</connector>
+			<connector xmi:idref="EAID_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
-					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
-					<style value="AllowDuplicates=0;Derived=0;Owned=0;Union=0;Navigable=Non-Navigable;"/>
+					<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_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
-					<model ea_localid="948" type="Class" name="epo:SubcontractTerm"/>
-					<role name="epo:definesSubcontractingTerm" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
+					<role name="epo:isSubjectToContractSpecificTerm" 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="Relation indicating a term has a subterm."/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1589"/>
+				<model ea_localid="4280"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ContractTerm has a SubcontractingTerm."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesSubcontractingTerm"/>
+				<labels rb="0..*" rt="+epo:isSubjectToContractSpecificTerm"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_FAA22183_A73E_42a1_854B_9995087470E4">
+			<connector xmi:idref="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0">
 				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
 					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:definesContractPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
+					<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="3251"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2971"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ContractTerm has a Period."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesContractPeriod"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4E161D86_3C31_466f_982A_26607071A85E">
-				<source xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
-					<model ea_localid="876" type="Class" name="epo:DesignContestRegimeTerm"/>
+			<connector xmi:idref="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1">
+				<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/>
@@ -31768,8 +33936,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_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6">
+					<model ea_localid="1891" type="Class" name="epo:ContractSpecificTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -31779,7 +33947,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2969"/>
+				<model ea_localid="4723"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -31790,147 +33958,145 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E">
-				<source xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
-					<model ea_localid="876" type="Class" name="epo:DesignContestRegimeTerm"/>
+			<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/>
 					<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_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
-					<model ea_localid="921" type="Class" name="epo:Prize"/>
-					<role name="epo:definesPrize" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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="1720"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2965"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a DesignContestRegimeTerm has a Prize."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:definesPrize"/>
-				<extendedProperties/>
+				<labels/>
+				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_279636BF_8F0D_4744_8B59_3277E5CE2E90">
-				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
-					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
+			<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/>
 					<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_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE">
-					<model ea_localid="971" type="Enumeration" name="at-voc:direct-award-justification"/>
-					<role name="epo:hasDirectAwardJustification" 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="1579"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="List of reasons for using a procedure which allows awarding contracts directly without publishing a notice. &#xA;&#xA;WG Approval 28/05/2020&#xA;"/>
+				<model ea_localid="2973"/>
+				<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:hasDirectAwardJustification"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_34156914_725C_4a26_B380_6FDE59360DAF">
-				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
-					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
+			<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/>
 					<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_31976DD6_F85A_4940_AC62_FA4769B4D88C">
-					<model ea_localid="906" type="Class" name="epo:Lot"/>
-					<role name="epo:refersToPreviousProcedureLot" 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="1578"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2975"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Reference to one or more Lots in a previous procedure.&#xA;&#xA;Additional Information:&#xA;In the case of Direct Award Terms, this property points to a previous Procedure justifying the use of Direct Award without a prior publication.&#xA;&#xA;This corresponds in the eForms to BT-1252	    Direct Award Justification Previous Procedure Identifier&#xA;&#xA;WG Approval 22/11/2019 14:33:55"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToPreviousProcedureLot"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7">
-				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
-					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
+			<connector xmi:idref="EAID_4E161D86_3C31_466f_982A_26607071A85E">
+				<source xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
+					<model ea_localid="876" type="Class" name="epo:DesignContestRegimeTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_8F3A6A54_584E_4f65_80B0_0C345D6703F4">
-					<model ea_localid="922" type="Class" name="epo:Procedure"/>
-					<role name="epo:refersToPreviousProcedure" 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="3106"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2969"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Reference to a previous procedure.&#xA;&#xA;Additional Information:&#xA;In the case of Direct Award Terms, this property points to a previous Procedure justifying the use of Direct Award without a prior publication.&#xA;&#xA;This corresponds in the eForms to BT-1252	    Direct Award Justification Previous Procedure Identifier"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:refersToPreviousProcedure"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
-				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
-					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
+			<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/>
@@ -31940,8 +34106,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+				<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/>
@@ -31951,7 +34117,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2984"/>
+				<model ea_localid="2977"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -31962,320 +34128,315 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
-				<source xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE">
-					<model ea_localid="3002" type="Class" name="epo:DirectContract"/>
+			<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/>
 					<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_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="4635"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2968"/>
+				<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_1BEBAC59_19C6_4908_B93C_EED975A6974F">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<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_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"/>
+				<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="3013"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2974"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="A universally unique identifier for an instance of this document.&#xA;&#xA;WG Approval 12/05/2020"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasUUID"/>
+				<labels/>
 				<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"/>
+			<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/>
 					<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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role name="epo:associatedWith" 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="2749"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4692"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The document to which a document is associated. &#xA;&#xA;WGM 01/03/2022&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:associatedWith"/>
+				<labels/>
 				<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"/>
+			<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_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_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="3012"/>
-				<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="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_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<connector xmi:idref="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
-					<role name="epo:hasOfficialLanguage" visibility="Public" targetScope="instance"/>
-					<type multiplicity="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="1574"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The language(s) in which the instances of the given concepts are officially available. These linguistic versions are equally legally valid.&#xA;&#xA;WG Approval 03/10/2019&#xA;&#xA;"/>
+				<model ea_localid="2966"/>
+				<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:hasOfficialLanguage"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role name="epo:hasElectronicDigest" 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="4445"/>
-				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasElectronicDigest"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<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/>
 					<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_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
-					<role name="epo:hasUnofficialLanguage" 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="1571"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="The language translation(s) in which the instances of the given concepts are available. These linguistic versions are not an official translation, they are provided only for information.&#xA;&#xA;WG Approval 03/10/2019&#xA;"/>
+				<model ea_localid="2980"/>
+				<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:hasUnofficialLanguage"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<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_4AE23ED9_1639_41e0_A758_C201E2EDE124">
-					<model ea_localid="2901" type="Class" name="epo:ElectronicSignature"/>
-					<role name="epo:hasElectronicSignature" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" 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="4444"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<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..*" rt="+epo:hasElectronicSignature"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
-				<source xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+			<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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role name="epo:refersToPrevious" 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="1569"/>
-				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToPrevious"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450">
-				<source xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
-					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
+			<connector xmi:idref="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -32285,8 +34446,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32296,7 +34457,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1415"/>
+				<model ea_localid="3596"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32307,9 +34468,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_43A3B220_8C42_4627_B845_A73F67127C06">
-				<source xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
-					<model ea_localid="2625" type="Class" name="epo:Offer"/>
+			<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/>
@@ -32319,8 +34480,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32330,7 +34491,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4056"/>
+				<model ea_localid="2979"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32341,9 +34502,43 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_618070AC_783D_48ae_9723_9C69BB0EB7B4">
-				<source xmi:idref="EAID_C8E5AF17_D979_4cff_83AB_E27B06BA632B">
-					<model ea_localid="3099" type="Class" name="epo-cat:PostAwardDocument"/>
+			<connector xmi:idref="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB">
+				<source xmi:idref="EAID_D67F46E0_2B15_4614_A170_F1414A602530">
+					<model ea_localid="2074" type="Note"/>
+					<role visibility="Public"/>
+					<type aggregation="none"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="false"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<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"/>
+					<type aggregation="none"/>
+					<constraints/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="AllowDuplicates=0;Derived=0;Union=0;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3339"/>
+				<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/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -32353,8 +34548,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32364,7 +34559,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4769"/>
+				<model ea_localid="3275"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32375,9 +34570,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47">
-				<source xmi:idref="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC">
-					<model ea_localid="1027" type="Class" name="epo:RequestForClarification"/>
+			<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/>
@@ -32387,8 +34582,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32398,7 +34593,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2742"/>
+				<model ea_localid="2983"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32409,9 +34604,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2">
-				<source xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
-					<model ea_localid="2630" type="Class" name="epo:OriginatorRequest"/>
+			<connector xmi:idref="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA">
+				<source xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
+					<model ea_localid="876" type="Class" name="epo:DesignContestRegimeTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -32421,8 +34616,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32432,7 +34627,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4063"/>
+				<model ea_localid="4803"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32443,9 +34638,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_9E4FF80B_FFD0_4320_961A_5B6B18435CAA">
-				<source xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+			<connector xmi:idref="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C">
+				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
+					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -32455,8 +34650,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32466,7 +34661,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4490"/>
+				<model ea_localid="2984"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32477,9 +34672,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A1934B85_FC19_4477_B74D_B5F732EECD28">
-				<source xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
-					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
+			<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/>
@@ -32489,8 +34684,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32500,7 +34695,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4489"/>
+				<model ea_localid="4831"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32511,9 +34706,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<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/>
@@ -32523,8 +34718,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32534,7 +34729,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1456"/>
+				<model ea_localid="3102"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -32545,9 +34740,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4">
-				<source xmi:idref="EAID_811D4703_55F7_4d6e_B8D8_207479C15419">
-					<model ea_localid="958" type="Class" name="epo:Tender"/>
+			<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/>
@@ -32557,8 +34752,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32568,9 +34763,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4488"/>
+				<model ea_localid="3346"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -32579,9 +34773,9 @@
 				<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"/>
+			<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/>
@@ -32591,8 +34785,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
+				<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/>
@@ -32602,9 +34796,8 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2744"/>
+				<model ea_localid="3347"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -32613,43 +34806,44 @@
 				<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"/>
+			<connector xmi:idref="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
-					<model ea_localid="878" type="Class" name="epo:Document"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3">
+					<model ea_localid="926" type="Class" name="epo:ProcurementDocument"/>
+					<role name="epo:involvesProcurementDocument" 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="2743"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2514"/>
+				<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:involvesProcurementDocument"/>
 				<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"/>
+			<connector xmi:idref="EAID_F1286B9A_905F_403f_B180_ECBF0307105F">
+				<source xmi:idref="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58">
+					<model ea_localid="849" type="Class" name="epo:AccessTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -32659,10 +34853,10 @@
 					<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 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:hasDocumentRestrictionJustification" 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;"/>
@@ -32670,55 +34864,52 @@
 					<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;"/>
+				<model ea_localid="2996"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="An explanation about the reasons why some procurement documents are restricted.&#xA;&#xA;Additional Information:&#xA;This corresponds in eForms to BT-707	 Documents Restricted Justification.&#xA;&#xA;WG Approval 09/03/2021&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rt="+epo-cat:hasExternalSpecification"/>
+				<labels rb="0..1" rt="+epo:hasDocumentRestrictionJustification"/>
 				<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"/>
+			<connector xmi:idref="EAID_279636BF_8F0D_4744_8B59_3277E5CE2E90">
+				<source xmi:idref="EAID_0A227254_932A_487b_B10A_658AA61F3CAD">
+					<model ea_localid="877" type="Class" name="epo:DirectAwardTerm"/>
 					<role visibility="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_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE">
+					<model ea_localid="971" type="Enumeration" name="at-voc:direct-award-justification"/>
+					<role name="epo:hasDirectAwardJustification" 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="1565"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1579"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="List of reasons for using a procedure which allows awarding contracts directly without publishing a notice. &#xA;&#xA;WG Approval 28/05/2020&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasDirectAwardJustification"/>
 				<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"/>
+			<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/>
@@ -32728,234 +34919,230 @@
 					<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"/>
+				<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;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"/>
+					<documentation/>
 					<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;"/>
+				<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 rb="0..1" rt="+epo:hasDPSScope"/>
+				<labels rb="0..1" rt="+epo:hasTenderValidityDuration"/>
 				<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"/>
+			<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/>
 					<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_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
-					<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="1563"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<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/>
+				<labels rb="0..1" rt="+epo:hasLateSubmissionPermission"/>
 				<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"/>
+			<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/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4514"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..*" rt="+epo:hasNonElectronicSubmissionJustification"/>
 				<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"/>
+			<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/>
 					<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_29C3D7E4_ECAE_4773_828D_74E22D192897">
-					<model ea_localid="1648" type="Class" name="epo:Estimate"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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:hasVariantPermission" 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="2787"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<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/>
+				<labels rb="0..1" rt="+epo:hasVariantPermission"/>
 				<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"/>
+			<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/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2974"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasESubmissionPermission"/>
 				<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"/>
+			<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/>
 					<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_0C735489_15DC_40a7_A94E_A9202738B188">
-					<model ea_localid="890" type="Class" name="epo:EvaluationTerm"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2527"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<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/>
+				<labels rb="0..*" rt="+epo:hasTenderSubcontractingInformation"/>
 				<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"/>
+			<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/>
 					<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_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_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"/>
-					<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="3053"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasECataloguePermission"/>
 				<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"/>
+			<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/>
@@ -32965,66 +35152,65 @@
 					<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"/>
+				<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="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="1533"/>
+				<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="0..1" rt="+epo:substantiatesExclusionGround"/>
+				<labels rb="0..1" rt="+epo:hasTenderValidityPeriod"/>
 				<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_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/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3975"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..*" rt="+epo:hasLanguage"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33034,10 +35220,10 @@
 					<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_B7C0137B_3C6D_42f7_AB51_FA49B0F7E63B">
+					<model ea_localid="987" type="Enumeration" name="at-voc:other-place-service"/>
+					<role name="epo:hasBroadPlaceOfPerformance" 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;"/>
@@ -33045,33 +35231,31 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2837"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1591"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Geopolitical zone where the contract can be executed.&#xA;&#xA;Additional Information&#xA;&#xA;Used for setting restrictions that cannot be established with one country code or a geographical zone identifier (like NUTS), because they have a broader scope (geographical, economic, political, other).&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:resultsFromLotAwardOutcome"/>
+				<labels rb="0..1" rt="+epo:hasBroadPlaceOfPerformance"/>
 				<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_A01E8ADE_1698_4353_BEDB_63334B745ECB">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<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"/>
+				<target xmi:idref="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo:definesContractDuration" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33080,55 +35264,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1527"/>
+				<model ea_localid="3250"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ContractTerm has a Duration."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:followsRulesSetBy"/>
+				<labels rb="0..1" rt="+epo:definesContractDuration"/>
 				<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_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="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_3780AA50_D898_4068_B300_47B46651CA0A">
-					<model ea_localid="953" type="Class" name="epo:Technique"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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:hasEInvoicingPermission" 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="1525"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4434"/>
+				<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:hasEInvoicingPermission"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33138,9 +35321,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_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82">
+					<model ea_localid="964" type="Enumeration" name="at-voc:applicability"/>
+					<role name="epo:hasReservedExecution" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33149,55 +35332,52 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2799"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4473"/>
+				<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:hasLaunchFrameworkAgreementMaximumValue"/>
+				<labels rb="0..1" rt="+epo:hasReservedExecution"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_DB75B7B6_85A1_4c67_A458_85EFC44E06B4">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="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_499A4BAD_6188_4f6f_B5BC_9B871A4349B8">
+					<model ea_localid="968" type="Enumeration" name="at-voc:contract-nature"/>
+					<role name="epo:hasContractNatureType" 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"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1404"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Subject of the acquisition.&#xA;&#xA;WG Approval 11/06/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasContractNatureType"/>
 				<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_EA34DF45_5E55_4138_B248_D15B011F82E1">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33207,10 +35387,10 @@
 					<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_499A4BAD_6188_4f6f_B5BC_9B871A4349B8">
+					<model ea_localid="968" type="Enumeration" name="at-voc:contract-nature"/>
+					<role name="epo:hasAdditionalContractNature" 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;"/>
@@ -33218,101 +35398,102 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1521"/>
+				<model ea_localid="1403"/>
 				<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;"/>
+				<documentation value="Additional type of acquisition taken into consideration in the contract.&#xA;&#xA;WG Approval 11/06/2020&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasFrameworkAgreementType"/>
+				<labels rb="0..*" rt="+epo:hasAdditionalContractNature"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC">
-				<source xmi:idref="EAID_FA070646_D88B_493f_96AB_8417E2069155">
-					<model ea_localid="898" type="Class" name="epo:FrameworkAgreementTerm"/>
+			<connector xmi:idref="EAID_F593B546_502A_413a_8694_914903478877">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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;"/>
+					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
+					<style value="AllowDuplicates=0;Derived=0;Owned=0;Union=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:hasLaunchGroupFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561">
+					<model ea_localid="948" type="Class" name="epo:SubcontractTerm"/>
+					<role name="epo:definesSubcontractingTerm" 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="Relation indicating a term has a subterm."/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4681"/>
+				<model ea_localid="1589"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ContractTerm has a SubcontractingTerm."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasLaunchGroupFrameworkAgreementMaximumValue"/>
+				<labels rb="0..1" rt="+epo:definesSubcontractingTerm"/>
 				<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_FAA22183_A73E_42a1_854B_9995087470E4">
+				<source xmi:idref="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2">
+					<model ea_localid="873" type="Class" name="epo:ContractTerm"/>
 					<role visibility="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_116B30E9_5947_4510_847A_7E8C5EEC0432">
+					<model ea_localid="915" type="Class" name="epo:Period"/>
+					<role name="epo:definesContractPeriod" 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="3251"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a ContractTerm has a Period."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:definesContractPeriod"/>
 				<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_B851F167_3C73_4e45_9F54_76A56333BE1E">
+				<source xmi:idref="EAID_44E7963D_28F5_4263_835A_24C87816F40C">
+					<model ea_localid="876" type="Class" name="epo:DesignContestRegimeTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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"/>
+				<target xmi:idref="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496">
+					<model ea_localid="921" type="Class" name="epo:Prize"/>
+					<role name="epo:definesPrize" 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;"/>
@@ -33320,19 +35501,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4449"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="1720"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Relation indicating a DesignContestRegimeTerm has a Prize."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFundProgramme"/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:definesPrize"/>
+				<extendedProperties/>
 				<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_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/>
@@ -33342,10 +35525,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_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;Owned=0;Navigable=Navigable;"/>
@@ -33353,34 +35536,32 @@
 					<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."/>
+				<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 rb="0..1" rt="+adms:identifier"/>
+				<labels rb="1" rt="+epo:hasFrameworkAgreementType"/>
 				<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_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/>
-					<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_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 name="epo:hasQualificationSystemDuration" 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;"/>
@@ -33388,21 +35569,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1617"/>
+				<model ea_localid="3315"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<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 rb="0..1" rt="+epo:hasQualificationSystemDuration"/>
 				<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_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/>
@@ -33412,10 +35593,10 @@
 					<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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -33423,19 +35604,21 @@
 					<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="2784"/>
+				<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;"/>
 				<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:hasPrizeValue"/>
 				<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_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/>
@@ -33445,9 +35628,9 @@
 					<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"/>
+				<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"/>
@@ -33456,19 +35639,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1515"/>
+				<model ea_localid="1383"/>
 				<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="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..*" rt="+epo:fulfillsRequirement"/>
+				<labels rb="0..*" rt="+epo:hasSubcontractingObligation"/>
 				<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_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA">
+				<source xmi:idref="EAID_C932A7D1_D54B_40f1_92A7_459C07235810">
+					<model ea_localid="1469" type="Class" name="epo:AwardEvaluationTerm"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33478,8 +35661,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_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/>
@@ -33489,7 +35672,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1516"/>
+				<model ea_localid="2528"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -33500,44 +35683,9 @@
 				<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<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_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"/>
-					<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="4733"/>
-				<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:concernsGreenProcurement"/>
-				<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_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/>
@@ -33547,8 +35695,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_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/>
@@ -33558,7 +35706,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1514"/>
+				<model ea_localid="2527"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -33569,9 +35717,9 @@
 				<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_85CFCF08_3F48_4102_8A68_8655E9F9B47E">
+				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
+					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33581,9 +35729,9 @@
 					<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"/>
+				<target xmi:idref="EAID_86057FC2_7717_4160_8952_6A9F572F43B2">
+					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
+					<role name="cccev:constrains" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33592,19 +35740,21 @@
 					<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="3217"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Information Concept about which a Constraint expresses a limitation.&#xA;&#xA;Additional Information:&#xA;Information Concepts are tools to make Requirements more machine processable: they allow to provide more detail about a Requirement. This way, Constraints can be made very precise, namely the limit that must be achieved, is a limit on the value for the associated Information Concept. For example, the Information Concept would be the age of a person and the Constraint would be the required age in the context of a specific evaluation."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels rb="0..*" rt="+cccev:constrains"/>
 				<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_91E24989_0AB1_44de_AF48_1EE54018D9E5">
+				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
+					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33614,10 +35764,10 @@
 					<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_02014F61_A766_467e_BD3D_7F41689C651B">
+					<model ea_localid="984" type="Enumeration" name="at-voc:number-threshold"/>
+					<role name="epo:hasThresholdType" 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;"/>
@@ -33625,56 +35775,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4666"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1692"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The method to interpret the threshold value as minimum or a maximum.&#xA;&#xA;WG Approval 17/09/2019&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:playedBy"/>
+				<labels rb="0..*" rt="+epo:hasThresholdType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1729B069_584F_4a4f_910B_A28B233CEB46">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A">
+				<source xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
+					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasAwardedEstimatedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target 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="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="1503"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3088"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The estimated value that can be spent as provided by the Award Decision.&#xA;&#xA;&lt;u&gt;Additional Information&lt;/u&gt;:&#xA;This property is used for framework agreements and dynamic purchasing systems. &#xA;Different cases of awarded values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;&#xA;WG Approval 12/12/2019&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasAwardedEstimatedValue"/>
+				<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_D65C20FC_D382_4766_9563_4C96020D607C">
+				<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/>
@@ -33684,10 +35831,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:hasFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1">
+					<model ea_localid="1899" type="Class" name="cccev:Constraint"/>
+					<role name="epo:hasConstraint" 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;"/>
@@ -33695,56 +35842,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4680"/>
+				<model ea_localid="3089"/>
 				<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:hasFrameworkAgreementMaximumValue"/>
+				<labels rb="0..*" rt="+epo:hasConstraint"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8E718222_A67E_4d16_8978_7B6F899FD855">
-				<source xmi:idref="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A">
-					<model ea_localid="1371" type="Class" name="epo:LotAwardOutcome"/>
+			<connector xmi:idref="EAID_C289FCF6_9241_4f06_BF53_F99082792332">
+				<source xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasFrameworkAgreementEstimatedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target 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="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="2800"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3084"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="This refers to BT-660 in eForms."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasFrameworkAgreementEstimatedValue"/>
+				<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_D84D8FB5_6889_47af_B88A_A418F4281BF1">
+				<source xmi:idref="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -33754,9 +35900,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_31165801_5B33_4e47_B39A_04F149020988">
+					<model ea_localid="1897" type="Enumeration" name="at-voc:criterion"/>
+					<role name="dct:type" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33765,56 +35911,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4683"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="4533"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Category to which the Requirement belongs."/>
 				<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="+dct:type"/>
 				<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_ACA750D2_84FF_4e07_B735_322F9131A442">
+				<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/>
 					<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_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D">
+					<model ea_localid="1796" type="Class" name="cccev:Criterion"/>
+					<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="3003"/>
+				<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_1864913C_FE85_48db_829F_004DFE769A97">
+				<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/>
@@ -33824,9 +35967,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:hasGroupFrameworkAgreementMaximumValue" 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"/>
@@ -33835,21 +35978,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2803"/>
+				<model ea_localid="3202"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="This corresponds to BT-156 in the eForms."/>
+				<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..1" rt="+epo:hasGroupFrameworkAgreementMaximumValue"/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
 				<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_6D204966_4BC2_452d_9B78_BA9B3F1E9FF6">
+				<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/>
@@ -33859,10 +36002,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_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
+					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
+					<role name="cccev:supportsRequirement" 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;"/>
@@ -33870,21 +36013,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2811"/>
+				<model ea_localid="3219"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Requirement for which the Evidence provides proof."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:describesLotGroup"/>
+				<labels rb="0..*" rt="+cccev:supportsRequirement"/>
 				<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_75FE12D8_04B5_410b_8362_9A907C438713">
+				<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/>
@@ -33894,9 +36037,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:announcesLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
+				<target xmi:idref="EAID_CB6F44C9_EE4B_44cf_8CCA_ADF25BA8D171">
+					<model ea_localid="3140" type="Class" name="epo-sub:Response"/>
+					<role name="epo:reinforcesResponse" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33905,21 +36048,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4644"/>
+				<model ea_localid="4819"/>
 				<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="0..*" rt="+epo:reinforcesResponse"/>
 				<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_8990AB87_7AAE_4276_AA04_83E4BB664FCB">
+				<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/>
@@ -33929,9 +36072,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_86057FC2_7717_4160_8952_6A9F572F43B2">
+					<model ea_localid="1968" type="Class" name="cccev:InformationConcept"/>
+					<role name="cccev:supportsConcept" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -33940,21 +36083,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4649"/>
+				<model ea_localid="3222"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Information Concept providing facts found/inferred from the Evidence.&#xA;&#xA;Additional Information:&#xA;Examples of Information Concepts are values found explictly in the evidence such as a birth date or information derived from the Evidence such as &quot;I am older that 18 years&quot; or &quot;this is a FairTrade product&quot;."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
+				<labels rb="0..*" rt="+cccev:supportsConcept"/>
 				<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_A7C105EE_0251_4249_919A_46302D44059E">
+				<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/>
@@ -33964,10 +36107,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:refersToLotGroupAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE">
+					<model ea_localid="1969" type="Enumeration" name="at-voc:confidentiality-level"/>
+					<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;"/>
@@ -33975,90 +36118,88 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4657"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="3221"/>
+				<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.	&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
+				<labels rb="0..1" rt="+cccev:confidentialityLevelType"/>
 				<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_04EC0265_2665_47d4_AEDA_E49049545B3B">
+				<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/>
 					<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_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="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="3224"/>
+				<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_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;"/>
+					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2965"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="3218"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_8210E652_8F84_48dd_BE0E_772ACFDB16C5">
+				<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/>
@@ -34068,8 +36209,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_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/>
@@ -34079,7 +36220,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2973"/>
+				<model ea_localid="3223"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34090,78 +36231,79 @@
 				<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_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;"/>
+					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2975"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4797"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<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"/>
+			<connector xmi:idref="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F">
+				<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=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"/>
+				<target xmi:idref="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC">
+					<model ea_localid="1896" type="Class" name="cccev:Requirement"/>
+					<role name="cccev:hasRequirement" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" 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"/>
+				<model ea_localid="3087"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="A more specific Requirement that is part of the Requirement."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:isSubjectToLotSpecificTerm"/>
+				<labels rb="0..*" rt="+cccev:hasRequirement"/>
 				<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_80871174_3D03_47c3_B90A_189BA5F246D6">
+				<source 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/>
@@ -34171,8 +36313,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_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/>
@@ -34182,7 +36324,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2977"/>
+				<model ea_localid="3991"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34193,9 +36335,9 @@
 				<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_E9117CC9_4B7F_4764_9040_E7244E1783CC">
+				<source xmi:idref="EAID_6F8E1C63_1DFD_4054_B253_1464F8C856A8">
+					<model ea_localid="3102" type="Note"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34205,8 +36347,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_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/>
@@ -34216,9 +36358,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2968"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4777"/>
+				<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/>
@@ -34227,9 +36369,9 @@
 				<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_30D2C78D_A7B9_4e68_B307_2638D65D637C">
+				<source xmi:idref="EAID_38BC5625_EAC0_4eb0_807A_C15FA10B40F7">
+					<model ea_localid="3035" type="Class" name="epo:AwardCriteriaSummary"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34239,8 +36381,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_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/>
@@ -34250,7 +36392,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4692"/>
+				<model ea_localid="4637"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34261,9 +36403,9 @@
 				<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_E006DB35_535D_4444_B447_89D7A813874C">
+				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
+					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34273,8 +36415,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_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/>
@@ -34284,7 +36426,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4754"/>
+				<model ea_localid="1694"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -34295,43 +36437,42 @@
 				<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_F088C989_3EAB_4eb9_BFCB_B139EAFC4E19">
+				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
+					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
 					<role visibility="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_0E6B28F7_3701_4b88_A833_0CAE48C1A9B8">
+					<model ea_localid="965" type="Enumeration" name="at-voc:award-criterion-type"/>
+					<role name="epo:hasAwardCriterionType" 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"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="1689"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Category of award criterion.&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasAwardCriterionType"/>
 				<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_FBEE0DFA_2173_46d4_8277_F34E55D2B1A0">
+				<source xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
+					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34341,9 +36482,9 @@
 					<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"/>
+				<target xmi:idref="EAID_21477DFB_067C_4dd2_AF25_AB05D2C71CC1">
+					<model ea_localid="983" type="Enumeration" name="at-voc:number-fixed"/>
+					<role name="epo:hasFixedValueType" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -34352,21 +36493,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2512"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ProcedureTerm has a Mediator."/>
+				<model ea_localid="1688"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The method to interpret the fixed value as pertaining to a total or unit.&#xA;&#xA;WG Approval 17/09/2019&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesMediator"/>
+				<labels rb="0..1" rt="+epo:hasFixedValueType"/>
 				<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_85A133A7_B643_4be4_BECC_55BA9277D3E5">
+				<source xmi:idref="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198">
+					<model ea_localid="1629" type="Class" name="epo:FinancialOffer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34376,10 +36515,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_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
+					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
+					<role name="epo:answersAwardCriteria" 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;"/>
@@ -34387,21 +36526,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4605"/>
+				<model ea_localid="2825"/>
 				<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:resultsFromUsingCandidateList"/>
+				<labels rb="1" rt="+epo:answersAwardCriteria"/>
 				<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_B5467B84_956A_4b79_8469_069C219DEFD9">
+				<source xmi:idref="EAID_640F316F_44B1_44a6_9B37_FD17A852946F">
+					<model ea_localid="1630" type="Class" name="epo:TechnicalOffer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34411,10 +36550,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2">
+					<model ea_localid="853" type="Class" name="epo:AwardCriterion"/>
+					<role name="epo:answersAwardCriteria" 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;"/>
@@ -34422,91 +36561,89 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4603"/>
+				<model ea_localid="2824"/>
 				<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="1" rt="+epo:answersAwardCriteria"/>
 				<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_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_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"/>
+				<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="3315"/>
-				<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="0..1" rt="+epo:hasQualificationSystemDuration"/>
+				<labels/>
 				<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_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_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_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="4734"/>
-				<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="1" rt="+epo:concernsNotice"/>
+				<labels/>
 				<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_5B73AEFB_F659_439b_9785_A42DDD528189">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo:ESPDResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -34516,10 +36653,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_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
+					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
+					<role name="epo:answersExclusionGround" 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;"/>
@@ -34527,21 +36664,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4735"/>
+				<model ea_localid="2822"/>
 				<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"/>
+				<labels rb="1" rt="+epo:answersExclusionGround"/>
 				<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_CDBD34E1_11DA_4fb3_B2A7_EEFBCE0199DD">
+				<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/>
@@ -34551,9 +36688,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_715A3156_5F19_4b35_B5F3_1BED9F96AB90">
+					<model ea_localid="892" type="Class" name="epo:ExclusionGround"/>
+					<role name="epo:announcesExclusionGround" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -34562,54 +36699,55 @@
 					<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="2818"/>
+				<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:hasNonPublicationJustification"/>
+				<labels rb="1" rt="+epo:announcesExclusionGround"/>
 				<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_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:refersToLot" 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="4691"/>
-				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:refersToLot"/>
+				<labels/>
 				<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_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/>
@@ -34619,10 +36757,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_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;"/>
@@ -34630,52 +36768,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3049"/>
+				<model ea_localid="1495"/>
 				<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"/>
+				<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:isBasedOnImplementingRegulation"/>
+				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
 				<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_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_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..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="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="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:conformsToLegalBasis"/>
+				<labels/>
 				<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_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/>
@@ -34685,10 +36824,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_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;"/>
@@ -34696,54 +36835,87 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3051"/>
+				<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;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
+				<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"/>
+					<role visibility="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_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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="3976"/>
+				<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/>
 				<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_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/>
 					<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_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_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="1598"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4518"/>
+				<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:refersToNotice"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF">
-				<source xmi:idref="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C">
-					<model ea_localid="910" type="Class" name="epo:Notice"/>
+			<connector xmi:idref="EAID_24D502F3_9569_4211_9D5F_B91738202FE7">
+				<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/>
@@ -34753,10 +36925,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:conformsToSpecificLegalBasis" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3A26D4B3_0F2F_4513_90E4_F69631B6BEE6">
+					<model ea_localid="3103" type="Class" name="epo-acc:Legislation"/>
+					<role name="epo-acc:implementsLegislation" 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;"/>
@@ -34764,19 +36936,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4477"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4778"/>
+				<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:conformsToSpecificLegalBasis"/>
+				<labels rb="0..*" rt="+epo-acc:implementsLegislation"/>
 				<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_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/>
@@ -34786,9 +36960,9 @@
 					<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"/>
+				<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"/>
@@ -34797,19 +36971,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1451"/>
+				<model ea_localid="1693"/>
 				<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;"/>
+				<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="+epo:hasFormType"/>
+				<labels rb="0..1" rt="+epo:hasWeightValueType"/>
 				<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_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/>
@@ -34819,169 +36993,169 @@
 					<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_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="4660"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..*" rt="+epo:hasPerformingStaffQualificationInformation"/>
 				<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_867949C8_0635_450e_85A4_AC036D959E8C">
+				<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/>
 					<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_5B748559_6ACE_401d_8620_2277FC03CBEF">
+					<model ea_localid="3105" type="Class" name="epo-acc:Question"/>
+					<role name="epo-acc:comprisesQuestion" 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="1773"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4782"/>
+				<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-acc:comprisesQuestion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_8C02C1C9_9374_471a_8C42_F2BF4DE15D1A">
+				<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/>
 					<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_8E88CD3B_9370_40c9_945F_A8FD72FBF8A4">
+					<model ea_localid="3121" type="Class" name="epo-acc:Article"/>
+					<role name="epo-acc:implementsArticle" 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="4725"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4799"/>
+				<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-acc:implementsArticle"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
-				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-					<model ea_localid="1811" type="Class" name="epo:NoticeChangeInformation"/>
+			<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=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:refersToPreviousNotice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="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="3044"/>
-				<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="&#xA;Additional information: &#xA;This corresponds in eForms to BT-758 Change Notice Version Identifier."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:refersToPreviousNotice"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_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/>
 					<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type 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-acc:announcesProcurementCriterion" 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="1774"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4776"/>
+				<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-acc:announcesProcurementCriterion"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_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/>
@@ -34991,8 +37165,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_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/>
@@ -35002,7 +37176,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1769"/>
+				<model ea_localid="4513"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35013,9 +37187,9 @@
 				<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_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/>
@@ -35025,8 +37199,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_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/>
@@ -35036,7 +37210,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1772"/>
+				<model ea_localid="3977"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35047,9 +37221,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_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/>
@@ -35059,8 +37233,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_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/>
@@ -35070,7 +37244,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1770"/>
+				<model ea_localid="1394"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35081,9 +37255,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_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/>
@@ -35093,8 +37267,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_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/>
@@ -35104,7 +37278,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1771"/>
+				<model ea_localid="4515"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35115,9 +37289,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
-				<source xmi:idref="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC">
-					<model ea_localid="1811" type="Class" name="epo:NoticeChangeInformation"/>
+			<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/>
@@ -35127,10 +37301,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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35138,21 +37312,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4744"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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="1" rt="+epo:concernsNotice"/>
+				<labels rb="0..1" rt="+epo:hasSelectionCriteriaUsage"/>
 				<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_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/>
@@ -35162,9 +37334,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:hasMaximumFrameworkAgreementAwardedValue" 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"/>
@@ -35173,21 +37345,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2802"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<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"/>
+				<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:hasMaximumFrameworkAgreementAwardedValue"/>
+				<labels rb="0..1" rt="+epo:hasSelectionCriterionType"/>
 				<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_4EB90EAA_7715_466f_B3EC_07F4892C035E">
+				<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/>
@@ -35197,10 +37367,10 @@
 					<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:describesResultNotice" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
+					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
+					<role name="epo:announcesSelectionCriteria" 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;"/>
@@ -35208,21 +37378,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4640"/>
+				<model ea_localid="2819"/>
 				<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="1" rt="+epo:announcesSelectionCriteria"/>
 				<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_EA5013BD_1CE9_454b_9F1D_5A805EEFD17D">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo:ESPDResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -35232,10 +37402,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:hasProcurementHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122">
+					<model ea_localid="942" type="Class" name="epo:SelectionCriterion"/>
+					<role name="epo:answersSelectionCriteria" 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;"/>
@@ -35243,21 +37413,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3179"/>
+				<model ea_localid="2823"/>
 				<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="1" rt="+epo:answersSelectionCriteria"/>
 				<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_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/>
@@ -35267,9 +37437,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_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"/>
@@ -35278,21 +37448,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2812"/>
-				<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:describesResultNotice"/>
+				<labels rb="0..1" rt="+epo:hasLabelType"/>
 				<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_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/>
@@ -35302,10 +37470,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:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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="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;"/>
@@ -35313,21 +37481,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4682"/>
+				<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:hasApproximateFrameworkAgreementValue"/>
+				<labels rb="1" rt="+epo:attestedByLabel"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<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"/>
+			<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/>
@@ -35337,10 +37505,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:hasProcurementLowestReceivedTenderValue" 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;"/>
@@ -35348,56 +37516,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3178"/>
+				<model ea_localid="3201"/>
 				<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="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:hasProcurementLowestReceivedTenderValue"/>
+				<labels rb="0..*" rt="+epo:hasCertification"/>
 				<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_2CEA69E5_ADCD_4af6_94C4_FD1CAF5CCC27">
+				<source xmi:idref="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD">
+					<model ea_localid="1900" 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;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:hasTotalAwardedValue" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20">
+					<model ea_localid="1901" 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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2801"/>
-				<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;"/>
+				<model ea_localid="3090"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalAwardedValue"/>
+				<labels/>
 				<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_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/>
@@ -35407,10 +37573,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_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;Owned=0;Navigable=Navigable;"/>
@@ -35418,21 +37584,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4639"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<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 rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<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_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/>
@@ -35442,10 +37606,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:refersToNoticeAwardInformation" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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;Owned=0;Navigable=Navigable;"/>
@@ -35453,56 +37617,53 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4655"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<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 rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<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_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/>
 					<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_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"/>
+				<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="4651"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1516"/>
+				<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:refersToNoticeAwardInformation"/>
+				<labels/>
 				<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_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/>
@@ -35512,10 +37673,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_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"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -35523,56 +37684,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2809"/>
+				<model ea_localid="4733"/>
 				<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="1" rt="+epo:concernsGreenProcurement"/>
 				<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:NoticeChangeInformation"/>
+			<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_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_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="4743"/>
-				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
+				<labels/>
 				<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:NoticeChangeInformation"/>
+			<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/>
@@ -35582,30 +37742,30 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7">
-					<model ea_localid="1009" type="Enumeration" name="at-voc:change-corrig-justification"/>
-					<role name="epo:hasChangeJustification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="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;"/>
-					<documentation value="The motives for the change.&#xA;&#xA;WG 5/11/2019&#xA;&#xA;The codelist to be used is at-voc:change-corrig-justification which is available at &#xA;http://publications.europa.eu/resource/dataset/change-corrig-justification"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1637"/>
+				<model ea_localid="1513"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Code explaining the change.&#xA;&#xA;WG Approval 5/11/2019&#xA;"/>
+				<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="1" rt="+epo:hasChangeJustification"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<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_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/>
@@ -35615,9 +37775,9 @@
 					<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"/>
+				<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"/>
@@ -35626,21 +37786,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4058"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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..*" rt="+epo:distributesOffer"/>
+				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
 				<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_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/>
@@ -35650,8 +37808,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+				<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/>
@@ -35661,7 +37819,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1363"/>
+				<model ea_localid="1390"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35672,77 +37830,108 @@
 				<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_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/>
 					<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"/>
+				<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"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<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;"/>
+				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
+				<labels rb="0..*" rt="+epo:includesAccessibilityCriterion"/>
+				<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"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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;"/>
+					<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"/>
-				<parameterSubstitutions/>
+				<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/>
+				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveVehicleCategory"/>
 				<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_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="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_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="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"/>
-				<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/>
-				<extendedProperties/>
+				<labels rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveContractType"/>
+				<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_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/>
@@ -35752,8 +37941,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+				<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/>
@@ -35763,7 +37952,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1384"/>
+				<model ea_localid="1565"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35774,43 +37963,42 @@
 				<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_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;"/>
+					<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_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;"/>
-					<documentation/>
+					<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="4057"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasDPSScope"/>
 				<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_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/>
@@ -35820,8 +38008,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+				<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/>
@@ -35831,7 +38019,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3265"/>
+				<model ea_localid="1563"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35842,9 +38030,9 @@
 				<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_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/>
@@ -35854,8 +38042,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985">
-					<model ea_localid="883" type="Class" name="epo:OfferingParty"/>
+				<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/>
@@ -35865,7 +38053,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3264"/>
+				<model ea_localid="1525"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -35876,89 +38064,89 @@
 				<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_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/>
 					<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_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"/>
-					<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"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasUsage"/>
 				<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_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="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_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;"/>
+					<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="1440"/>
+				<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&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasValidityPeriod"/>
 				<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_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_B63C4BE8_86E2_494f_AB88_882E3568B3F0">
+					<model ea_localid="999" type="Enumeration" name="at-voc:winner-selection-status"/>
+					<role name="epo:hasAwardStatus" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -35967,34 +38155,32 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1704"/>
-				<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"/>
+				<model ea_localid="2583"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Indicates whether the lot is awarded, not awarded or still open.&#xA;WG Approval 03/12/2019&#xA;&#xA;"/>
 				<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:hasAwardStatus"/>
 				<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_547A511C_F377_4405_82EA_14ABA20458B6">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<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_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:hasAwardedValue" 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;"/>
@@ -36002,90 +38188,90 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1447"/>
+				<model ea_localid="1462"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The value of the procurement provided by the Award Decision.&#xA;&#xA;Additional Information:&#xA;Different cases of awarded values may refer to a lot, the global value of the procedure, or of a combinatorial value of a group of lots.&#xA;&#xA;In the case of framework agreements and dynamic purchasing systems this refers to the maximum awarded value.&#xA;&#xA;WG Approval 10/12/2019"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1..*" rt="+epo:hasMember"/>
+				<labels rb="0..1" rt="+epo:hasAwardedValue"/>
 				<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_AF4C01E9_6CF5_410f_83E6_3CAF530D5403">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="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_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B">
+					<model ea_localid="1370" type="Class" name="epo:TenderAwardOutcome"/>
+					<role name="epo:comprisesTenderAwardOutcome" 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="3189"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2503"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Incorporates TenderAwardOutcome."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..*" rt="+epo:comprisesTenderAwardOutcome"/>
 				<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_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_B2165393_B24C_4dd7_A2E2_DE976E538481">
+					<model ea_localid="1719" type="Class" name="epo:ContextualProjection"/>
+					<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="1446"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4757"/>
+				<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:leadBy"/>
+				<labels/>
 				<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_C9140D6A_9EC6_4bc0_B489_096BF3AE570A">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36095,9 +38281,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_D46376EC_6B98_4926_8627_A594E6819D78">
+					<model ea_localid="981" type="Enumeration" name="at-voc:non-award-justification"/>
+					<role name="epo:hasNonAwardJustification" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36106,21 +38292,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4072"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<model ea_localid="2584"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="On hold; Enumeration.&#xA;&#xA;&#xA;"/>
 				<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:hasNonAwardJustification"/>
 				<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_D257E7B8_BA32_4888_BB1A_167306D6B16C">
+				<source xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36130,10 +38314,10 @@
 					<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:hasBargainPrice" 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;"/>
@@ -36141,19 +38325,21 @@
 					<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="3439"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The value of procured supplies that have used a particularly advantageous opportunity available for a very short time at a value considerably lower than normal market prices.&#xA;&#xA;WG approval 23/05/2023"/>
 				<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:hasBargainPrice"/>
 				<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_36C907D3_6701_4489_9BBA_3C0E1D4E25A8">
+				<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/>
@@ -36163,8 +38349,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4">
-					<model ea_localid="924" type="Class" name="epo:ProcurementCriterion"/>
+				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36174,7 +38360,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3974"/>
+				<model ea_localid="4607"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36185,9 +38371,9 @@
 				<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_CF215D61_0282_4111_B11C_CBD651205C58">
+				<source xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36197,9 +38383,9 @@
 					<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"/>
+				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+					<role name="epo:comprisesAwardOutcome" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36208,19 +38394,21 @@
 					<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="2833"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="Incorporates AwardOutcome."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReservedProcurement"/>
+				<labels rb="0..*" rt="+epo:comprisesAwardOutcome"/>
 				<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_F241B2E1_47C3_4512_8EBE_A60BD8ED070A">
+				<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/>
@@ -36230,8 +38418,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_3684AAB5_4B5D_4fd9_8A90_5438036D0B5D">
-					<model ea_localid="2590" type="Class" name="epo:ProcurementCriteriaSummary"/>
+				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -36241,7 +38429,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3976"/>
+				<model ea_localid="2999"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36252,9 +38440,9 @@
 				<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_F5BE64C7_3F6B_4881_AB89_9342AF882E95">
+				<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/>
@@ -36264,10 +38452,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_E7437025_771F_4143_BE33_620A29646687">
+					<model ea_localid="3068" type="Class" name="epo:AwardOutcome"/>
+					<role name="epo:summarisesInformationForAwardOutcome" 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;"/>
@@ -36275,21 +38463,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2544"/>
+				<model ea_localid="2797"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestProcessor."/>
+				<documentation value="Relates to submission for the given competition, either at Lot level or Mini-Competition level.&#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:definesParticipationRequestProcessor"/>
+				<labels rb="1" rt="+epo:summarisesInformationForAwardOutcome"/>
 				<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_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/>
@@ -36299,9 +38487,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:hasFrameworkAgreementMaximumValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36310,21 +38498,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2543"/>
+				<model ea_localid="4680"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ParticipationRequestTerm has a ParticipationRequestReceiver."/>
+				<documentation/>
 				<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:hasFrameworkAgreementMaximumValue"/>
 				<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_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/>
@@ -36336,7 +38524,7 @@
 				</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"/>
+					<role name="epo:hasApproximateFrameworkAgreementValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -36345,68 +38533,69 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2784"/>
+				<model ea_localid="4683"/>
 				<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 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="0..1" rt="+epo:hasPrizeValue"/>
+				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
 				<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_57BA1AAE_EBFD_419c_8F21_8256FE25DBAC">
+				<source xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE">
+					<model ea_localid="3002" type="Class" name="epo:DirectContract"/>
 					<role visibility="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_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"/>
-					<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="4635"/>
+				<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:resultsFromLotAwardOutcome"/>
 				<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_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/>
 					<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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -36414,55 +38603,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1426"/>
+				<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="1..*" rt="+epo:isSubjectToProcedureSpecificTerm"/>
+				<labels rb="0..*" rt="+epo:resultsFromLotAwardOutcome"/>
 				<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_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/>
 					<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: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;"/>
+					<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="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/>
+				<labels rb="0..1" rt="+epo:hasGroupFrameworkAgreementMaximumValue"/>
 				<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_5ACD6A3D_7AA3_4504_8B13_015B01092BC2">
+				<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/>
@@ -36472,8 +38662,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD">
-					<model ea_localid="1773" type="Class" name="epo:ProcedureSpecificTerm"/>
+				<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/>
@@ -36483,7 +38673,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3275"/>
+				<model ea_localid="2831"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -36494,21 +38684,21 @@
 				<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"/>
+			<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/>
 					<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"/>
+				<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"/>
@@ -36517,89 +38707,91 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1460"/>
+				<model ea_localid="4644"/>
 				<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..*" rt="+epo:announcesLotGroupAwardInformation"/>
 				<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_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;"/>
+					<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_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;"/>
+					<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="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/>
+				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
 				<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_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/>
 					<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_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;"/>
+					<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="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/>
+				<labels rb="0..*" rt="+epo:refersToLotGroupAwardInformation"/>
 				<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_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/>
@@ -36609,9 +38801,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_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"/>
@@ -36620,21 +38812,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2536"/>
+				<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="0..*" rt="+epo:specifiesProcurementCriteriaSummary"/>
+				<labels rb="0..*" rt="+epo:announcesLotGroupAwardInformation"/>
 				<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_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/>
@@ -36644,9 +38836,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_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"/>
@@ -36655,19 +38847,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="4605"/>
+				<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:resultsFromUsingCandidateList"/>
 				<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_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/>
@@ -36677,64 +38871,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_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"/>
 					<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="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..*" rt="+epo:hasPerformingStaffQualificationInformation"/>
+				<labels rb="0..1" rt="+epo:resultsFromMiniCompetitionAwardOutcome"/>
 				<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_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"/>
 					<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:hasMaximumFrameworkAgreementAwardedValue" 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="4519"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2802"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasMaximumFrameworkAgreementAwardedValue"/>
 				<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_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/>
@@ -36744,10 +38941,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_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;"/>
@@ -36755,21 +38952,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3063"/>
+				<model ea_localid="4640"/>
 				<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:describesDirectAwardPrenotificationNotice"/>
 				<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_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/>
@@ -36779,10 +38976,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: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;Owned=0;Navigable=Navigable;"/>
@@ -36790,21 +38987,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3007"/>
+				<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 rb="0..*" rt="+epo:specifiesProcurementCriterion"/>
+				<labels rb="0..1" rt="+epo:hasProcurementHighestReceivedTenderValue"/>
 				<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_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/>
@@ -36814,9 +39011,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_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"/>
@@ -36825,56 +39022,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3107"/>
+				<model ea_localid="2812"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relates to Lot."/>
+				<documentation/>
 				<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:describesResultNotice"/>
 				<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_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0">
+				<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=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<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"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3111"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2830"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_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/>
@@ -36884,9 +39080,9 @@
 					<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"/>
+				<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"/>
@@ -36895,55 +39091,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2510"/>
+				<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 rb="0..1" rt="+epo:isExecutedByProcurementServiceProvider"/>
+				<labels rb="0..1" rt="+epo:hasApproximateFrameworkAgreementValue"/>
 				<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_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;"/>
+					<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_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;"/>
+					<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"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasProcurementLowestReceivedTenderValue"/>
 				<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_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/>
@@ -36953,9 +39150,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_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"/>
@@ -36964,21 +39161,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4076"/>
+				<model ea_localid="2801"/>
 				<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 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..1" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasTotalAwardedValue"/>
 				<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_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/>
@@ -36988,9 +39185,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_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"/>
@@ -36999,123 +39196,126 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4074"/>
+				<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 rb="0..1" rt="+epo:refersToProject"/>
+				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
 				<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_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/>
 					<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_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;"/>
+					<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"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:refersToNoticeAwardInformation"/>
 				<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_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/>
 					<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_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_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;"/>
+					<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="4651"/>
+				<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:refersToNoticeAwardInformation"/>
 				<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_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/>
 					<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="2844"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:announcesNoticeAwardInformation"/>
 				<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_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/>
@@ -37125,10 +39325,10 @@
 					<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"/>
-					<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: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;"/>
@@ -37136,21 +39336,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3132"/>
+				<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="1" rt="+epo:resolvesReviewRequest"/>
+				<labels rb="0..1" rt="+epo:hasStartDate"/>
 				<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_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/>
@@ -37160,10 +39360,10 @@
 					<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_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;"/>
@@ -37171,87 +39371,88 @@
 					<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="2498"/>
+				<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:providesRulingOnRemedy"/>
+				<labels rb="1" rt="+epo:concernsTender"/>
 				<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_C3A99946_EA61_4bb4_BBB2_994F422EB5DD">
+				<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/>
 					<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_B2165393_B24C_4dd7_A2E2_DE976E538481">
+					<model ea_localid="1719" type="Class" name="epo:ContextualProjection"/>
+					<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="2299"/>
+				<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_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;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_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;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="3158"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<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_72A6C38F_77C6_4480_A13E_A5E9A66D9379">
+				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37261,10 +39462,10 @@
 					<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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasConcessionEstimatedValue" 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;"/>
@@ -37272,32 +39473,34 @@
 					<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="4634"/>
+				<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:hasReviewDecisionType"/>
+				<labels rb="0..1" rt="+epo:hasConcessionEstimatedValue"/>
 				<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_91D18452_424C_4f36_8E1E_BF993F4D765A">
+				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasEstimatedUserConcessionRevenue" 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;"/>
@@ -37305,32 +39508,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4662"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="1490"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The estimated revenue coming from the use of the concession.&#xA;&#xA;Additional Information:&#xA;Revenues are for example fees and fines. For example, the fees and fines coming from the cars using a motorway.&#xA;&#xA;This corresponds to BT-162 in eForms.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasReviewBodyType"/>
+				<labels rb="0..1" rt="+epo:hasEstimatedUserConcessionRevenue"/>
 				<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_C35EEDCE_0633_482d_BA4A_4553057B7C23">
+				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:hasEstimatedBuyerConcessionRevenue" 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;"/>
@@ -37338,21 +39543,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4756"/>
+				<model ea_localid="1487"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a ReviewTerm has a Reviewer."/>
+				<documentation value="The expected payments made by the buyer to the economic operator awarded the concession that are not directly related to the use of the concession.&#xA;&#xA;&lt;u&gt;Additional Information:&lt;/u&gt;&#xA;For example the public buyer pays a yearly fee to provide a ticketing solution to the public.  The fee the public pays for every ticket sold through the solution is not included in this estimation but in the estimation of the user concession revenue.&#xA;&#xA;This corresponds to BT-160 in eForms.&#xA;&#xA;WG Approval 07/01/2020"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:definesReviewer"/>
+				<labels rb="0..1" rt="+epo:hasEstimatedBuyerConcessionRevenue"/>
 				<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_F08185C3_E8E6_4c0c_A2A4_E3D451902197">
+				<source xmi:idref="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37362,8 +39567,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_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/>
@@ -37373,7 +39578,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2862"/>
+				<model ea_localid="3249"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -37384,9 +39589,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_47C8CD49_71D8_4ef9_919E_87DD36154F85">
+				<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/>
@@ -37396,10 +39601,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_67406FC0_EABC_4d83_B727_BC88B30CF43C">
+					<model ea_localid="2003" type="Class" name="epo:ConcessionEstimate"/>
+					<role name="epo:foreseesConcession" 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;"/>
@@ -37407,89 +39612,89 @@
 					<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="3248"/>
+				<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:hasIrregularityType"/>
+				<labels rb="0..1" rt="+epo:foreseesConcession"/>
 				<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_0F0A4585_C0E2_4438_81E0_5F41FAE01E73">
+				<source 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="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_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_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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2852"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3960"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_1DAFA4D2_EE54_4246_A132_FC5F510A59ED">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2846"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4767"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_356035E1_7546_4bda_9685_286F5A33ED5A">
+				<source 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/>
@@ -37499,8 +39704,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1">
-					<model ea_localid="1677" type="Class" name="epo:ReviewObject"/>
+				<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/>
@@ -37510,7 +39715,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2670"/>
+				<model ea_localid="2843"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -37521,214 +39726,214 @@
 				<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_450148E7_98E2_4642_9EE2_203242F5A4D8">
+				<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=Non-Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<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_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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4654"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3182"/>
+				<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:announcesReviewObject"/>
+				<labels/>
 				<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_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4755"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4771"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_C1CAAF14_976F_4d28_938A_6ECEC8F64316">
+				<source 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="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:hasAllegedIrregularityType" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<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="4768"/>
+				<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:hasAllegedIrregularityType"/>
+				<labels/>
 				<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_CAF4D83B_854B_440e_83CF_1BD4AAE5F1B9">
+				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasReviewRequestFee" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2851"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3047"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_D144C8C1_24F9_4de5_AD13_CFEBA70F68FD">
+				<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;"/>
+					<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_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;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="4772"/>
+				<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_25DE37BE_E478_4159_8F53_7F49CAD18053">
+				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
 					<role visibility="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_4F81C811_16F5_4332_BAEA_9843D331872F">
-					<model ea_localid="944" type="Class" name="epo:StatisticalInformation"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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="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="2669"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="2838"/>
+				<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:refersToContract"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_3284019D_3E6C_424a_AACD_8319D1389BB9">
+				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37738,10 +39943,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:concernsReviewSummaryForLot" 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:providesContractTotalPenaltyValue" 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;"/>
@@ -37749,21 +39954,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2854"/>
+				<model ea_localid="2841"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<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 value="&#xA;Additional Information:&#xA;This corresponds to BT-782 in eForms. &#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:concernsReviewSummaryForLot"/>
+				<labels rb="0..1" rt="+epo:providesContractTotalPenaltyValue"/>
 				<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_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458">
+				<source xmi:idref="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE">
+					<model ea_localid="1672" type="Class" name="epo:ContractLotCompletionInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37773,9 +39978,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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
+					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
+					<role name="epo:providesContractTotalPaymentValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -37784,21 +39989,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4599"/>
+				<model ea_localid="2840"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Additional Information:&#xA;This corresponds to BT-779 in eForms. "/>
 				<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:providesContractTotalPaymentValue"/>
 				<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"/>
+			<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/>
@@ -37808,8 +40013,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8AE4C3CE_22B6_4940_B998_737CC28550AB">
-					<model ea_localid="2593" type="Class" name="epo:SelectionCriteriaSummary"/>
+				<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/>
@@ -37819,7 +40024,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4515"/>
+				<model ea_localid="2787"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -37830,42 +40035,43 @@
 				<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_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=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_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="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="2862"/>
+				<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_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/>
@@ -37875,10 +40081,10 @@
 					<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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -37886,19 +40092,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1392"/>
+				<model ea_localid="2853"/>
 				<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;"/>
+				<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="0..1" rt="+epo:hasSelectionCriterionType"/>
+				<labels rb="1" rt="+epo:hasIrregularityType"/>
 				<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_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/>
@@ -37908,9 +40114,9 @@
 					<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"/>
+				<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"/>
@@ -37919,19 +40125,21 @@
 					<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="2852"/>
+				<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"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:fulfillsRequirement"/>
+				<labels rb="0..*" rt="+epo:hasReviewIrregularitySummary"/>
 				<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_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/>
@@ -37941,8 +40149,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_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/>
@@ -37952,7 +40160,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1390"/>
+				<model ea_localid="2669"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -37997,22 +40205,22 @@
 				<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_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;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_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_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;Owned=0;Navigable=Navigable;"/>
@@ -38020,19 +40228,21 @@
 					<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="1386"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<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;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:includesAccessibilityCriterion"/>
+				<labels rb="0..1" rt="+epo:hasSubcontractingEstimatedValue"/>
 				<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_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/>
@@ -38042,9 +40252,9 @@
 					<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"/>
+				<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"/>
@@ -38053,33 +40263,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1493"/>
+				<model ea_localid="1385"/>
 				<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:fulfillsStrategicProcurement"/>
+				<labels rb="0..*" rt="+epo:foreseesSubcontracting"/>
 				<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_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;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_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D">
 					<model ea_localid="960" type="Class" name="epo:MonetaryValue"/>
-					<role name="epo:hasSubcontractingEstimatedValue" visibility="Public" targetScope="instance"/>
+					<role name="epo:hasHighestReceivedTenderValue" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38088,34 +40298,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1386"/>
+				<model ea_localid="2796"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<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 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 rb="0..1" rt="+epo:hasSubcontractingEstimatedValue"/>
+				<labels rb="0..1" rt="+epo:hasHighestReceivedTenderValue"/>
 				<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_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/>
 					<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_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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38123,34 +40333,32 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1385"/>
-				<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..*" rt="+epo:foreseesSubcontracting"/>
+				<labels rb="0..1" rt="+epo:hasReceivedSubmissionType"/>
 				<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_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;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_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_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;Owned=0;Navigable=Navigable;"/>
@@ -38158,21 +40366,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1557"/>
+				<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 rb="0..*" rt="+epo:specifiesSubcontractors"/>
+				<labels rb="0..1" rt="+epo:hasLowestReceivedTenderValue"/>
 				<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_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/>
@@ -38182,10 +40390,10 @@
 					<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_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;"/>
@@ -38193,19 +40401,21 @@
 					<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="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..*" rt="+epo:hasSubcontractingObligation"/>
+				<labels rb="0..1" rt="+epo:hasUUID"/>
 				<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_39F3583F_0D40_4e9f_8018_10297955785C">
+				<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/>
@@ -38215,10 +40425,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:hasHighestReceivedTenderValue" 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:associatedWith" 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;"/>
@@ -38226,21 +40436,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2796"/>
+				<model ea_localid="2749"/>
 				<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 document to which a document is associated. &#xA;&#xA;WGM 01/03/2022&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasHighestReceivedTenderValue"/>
+				<labels rb="0..*" rt="+epo:associatedWith"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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_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/>
@@ -38250,10 +40460,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -38261,19 +40471,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2932"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<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..1" rt="+epo:hasReceivedSubmissionType"/>
+				<labels rb="0..*" rt="+adms:identifier"/>
 				<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_6A9FC4EC_D843_4ffe_84A8_24E86C3ED8AF">
+				<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/>
@@ -38283,32 +40495,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:hasLowestReceivedTenderValue" 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:hasOfficialLanguage" 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="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;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<model ea_localid="1574"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The language(s) in which the instances of the given concepts are officially available. These linguistic versions are equally legally valid.&#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..1" rt="+epo:hasLowestReceivedTenderValue"/>
+				<labels rb="1..*" rt="+epo:hasOfficialLanguage"/>
 				<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_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009">
+				<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/>
@@ -38318,10 +40528,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_91FCDF9A_77D0_4ad5_B217_37E957B3B448">
+					<model ea_localid="878" type="Class" name="epo:Document"/>
+					<role name="epo:hasElectronicDigest" 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;"/>
@@ -38329,19 +40539,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<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;"/>
+				<model ea_localid="4445"/>
+				<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:hasLateSubmissionPermission"/>
+				<labels rb="0..*" rt="+epo:hasElectronicDigest"/>
 				<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_AF2EA1D0_30FA_474c_BA0E_2B284F62AB15">
+				<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/>
@@ -38351,10 +40563,10 @@
 					<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_1A66B07B_A8FD_481e_8217_0049EA327F90">
+					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
+					<role name="epo:hasUnofficialLanguage" 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;"/>
@@ -38362,21 +40574,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3118"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
-				<documentation value="Relation indicating a SubmissionTerm has a TenderReceiver."/>
+				<model ea_localid="1571"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="The language translation(s) in which the instances of the given concepts are available. These linguistic versions are not an official translation, they are provided only for information.&#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="+epo:definesTenderReceiver"/>
+				<labels rb="0..*" rt="+epo:hasUnofficialLanguage"/>
 				<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_B1894735_8A0D_4eae_BCF0_75001B7FF4D0">
+				<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/>
@@ -38386,9 +40596,9 @@
 					<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"/>
+				<target xmi:idref="EAID_4AE23ED9_1639_41e0_A758_C201E2EDE124">
+					<model ea_localid="2901" type="Class" name="epo:ElectronicSignature"/>
+					<role name="epo:hasElectronicSignature" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -38397,32 +40607,34 @@
 					<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="4444"/>
+				<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:hasNonElectronicSubmissionJustification"/>
+				<labels rb="0..*" rt="+epo:hasElectronicSignature"/>
 				<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_DFE11A54_45B0_449d_B8FF_34E21440DAD9">
+				<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Unspecified;"/>
 					<documentation/>
 					<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"/>
-					<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:refersToPrevious" 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;"/>
@@ -38430,221 +40642,225 @@
 					<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="1569"/>
+				<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:hasVariantPermission"/>
+				<labels rb="0..*" rt="+epo:refersToPrevious"/>
 				<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_29996CD1_F979_44e0_95A0_E058E0BD5450">
+				<source 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="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_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_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="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;"/>
+				<model ea_localid="1415"/>
+				<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:hasESubmissionPermission"/>
+				<labels/>
 				<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_43A3B220_8C42_4627_B845_A73F67127C06">
+				<source xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
+					<model ea_localid="2625" type="Class" name="epo:Offer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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"/>
+				<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="2540"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4056"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating a SubmissionTerm has a TenderProcessor."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:definesTenderProcessor"/>
+				<labels/>
 				<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_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_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_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="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="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..*" rt="+epo:hasTenderSubcontractingInformation"/>
+				<labels/>
 				<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_618070AC_783D_48ae_9723_9C69BB0EB7B4">
+				<source 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="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_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_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="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="4769"/>
+				<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:hasECataloguePermission"/>
+				<labels/>
 				<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_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47">
+				<source xmi:idref="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC">
+					<model ea_localid="1027" type="Class" name="epo:RequestForClarification"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasTenderValidityPeriod" 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 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="1442"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2742"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The relation indicating until when a tender instance is applicable.&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTenderValidityPeriod"/>
+				<labels/>
 				<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_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2">
+				<source xmi:idref="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838">
+					<model ea_localid="2630" type="Class" name="epo:OriginatorRequest"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_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="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="4063"/>
+				<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:hasLanguage"/>
+				<labels/>
 				<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_97C17D51_4DF6_4979_B308_C0F08C743DCF">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38654,8 +40870,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_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/>
@@ -38665,7 +40881,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1374"/>
+				<model ea_localid="4469"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -38676,252 +40892,247 @@
 				<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_9E4FF80B_FFD0_4320_961A_5B6B18435CAA">
+				<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/>
-					<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;"/>
 					<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_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="1695"/>
-				<properties ea_type="Association" direction="Bi-Directional"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4490"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_A1934B85_FC19_4477_B74D_B5F732EECD28">
+				<source xmi:idref="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8">
+					<model ea_localid="854" type="Class" name="epo:AwardDecision"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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:hasUsage" 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 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="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="4489"/>
+				<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:hasUsage"/>
+				<labels/>
 				<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_A6577BAD_B1CB_4608_94A0_32241C0F50CE">
+				<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;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:hasValidityPeriod" 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 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="1440"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1456"/>
+				<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&#xA;"/>
+				<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_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_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4">
+				<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;"/>
 					<documentation/>
 					<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_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="3181"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4488"/>
+				<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:foreseesTechnique"/>
+				<labels/>
 				<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_C7D18971_E3AA_4bc3_B35F_CBFE4CDAAA84">
+				<source xmi:idref="EAID_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo:ESPDResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_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="3180"/>
-				<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..*" rt="+epo:usesTechnique"/>
+				<labels/>
 				<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_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;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:concernsTender" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" 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="2498"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<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 rb="1" rt="+epo:concernsTender"/>
+				<labels/>
 				<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_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_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"/>
+				<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="2497"/>
-				<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 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/>
 				<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_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/>
@@ -38931,10 +41142,10 @@
 					<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"/>
-					<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 aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -38942,33 +41153,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2469"/>
+				<model ea_localid="4364"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The Winner must be a Tenderer."/>
+				<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:needsToBeATenderer"/>
+				<labels rt="+epo-cat:hasExternalSpecification"/>
 				<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_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/>
-					<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_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_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"/>
@@ -38977,21 +41188,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1366"/>
-				<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"/>
+				<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:isSubmitedBy"/>
+				<labels rb="0..1" rt="+epo:isBasedOnImplementingRegulation"/>
 				<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_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/>
@@ -39001,9 +41210,9 @@
 					<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"/>
+				<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"/>
@@ -39012,21 +41221,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2981"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<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 rb="0..*" rt="+epo:isSubjectToTerm"/>
+				<labels rb="0..*" rt="+epo:conformsToLegalBasis"/>
 				<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_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/>
@@ -39036,10 +41243,10 @@
 					<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_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;"/>
@@ -39047,31 +41254,31 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4731"/>
+				<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..1" rt="+epo:specifiesCleanVehicleDirectiveVehicleCategory"/>
+				<labels rb="1" rt="+epo:hasNoticeType"/>
 				<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_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;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"/>
+				<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"/>
@@ -39080,19 +41287,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4730"/>
-				<properties ea_type="Dependency" 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 rb="0..1" rt="+epo:specifiesCleanVehicleDirectiveContractType"/>
+				<labels rb="0..1" rt="+epo:refersToNotice"/>
 				<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_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/>
@@ -39102,10 +41311,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..*" 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;Owned=0;Navigable=Navigable;"/>
@@ -39113,21 +41322,19 @@
 					<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."/>
+				<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 rb="0..*" rt="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo:hasFormType"/>
 				<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_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/>
@@ -39137,8 +41344,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_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/>
@@ -39148,7 +41355,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1448"/>
+				<model ea_localid="1773"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -39159,78 +41366,78 @@
 				<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_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_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_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="3091"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4734"/>
+				<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:concernsNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_5217DA2B_F336_4793_85E1_6829959E93BB">
+				<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=Unspecified;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
-					<role name="epo:hasCertification" 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="4578"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4725"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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"/>
-				<extendedProperties/>
+				<labels/>
+				<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_7E3AE348_60D1_44cb_BC5F_08B65291C2AC">
+				<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/>
@@ -39240,10 +41447,10 @@
 					<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_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role name="epo:refersToPreviousNotice" 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;"/>
@@ -39251,192 +41458,191 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4026"/>
+				<model ea_localid="3044"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="&#xA;Additional information: &#xA;This corresponds in eForms to BT-758 Change Notice Version Identifier."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:playedBy"/>
+				<labels rb="1" rt="+epo:refersToPreviousNotice"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_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="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_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_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="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="2568"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="1774"/>
+				<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:hasNutsCode"/>
-				<extendedProperties/>
+				<labels/>
+				<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_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_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"/>
+				<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="3024"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1769"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+locn:addressID"/>
+				<labels/>
 				<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_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_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_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="1707"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;"/>
+				<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..1" rt="+epo:hasCountryCode"/>
+				<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_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_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_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="1750"/>
-				<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="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/>
 				<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_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/>
 					<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:address" 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="1506"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1771"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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="+cv:address"/>
+				<labels/>
 				<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_CF14464A_EF1A_4230_BB7E_A40906D6ED97">
+				<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/>
@@ -39446,10 +41652,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:hasLegalIdentifier" 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 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;Owned=0;Navigable=Navigable;"/>
@@ -39457,21 +41663,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4117"/>
+				<model ea_localid="4744"/>
 				<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="1" rt="+epo:concernsNotice"/>
 				<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_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/>
@@ -39481,10 +41687,10 @@
 					<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_67E2E371_0A7D_4004_B8A4_6F969F59938C">
+					<model ea_localid="910" type="Class" name="epo:Notice"/>
+					<role 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;"/>
@@ -39492,87 +41698,89 @@
 					<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="4773"/>
+				<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:hasMainActivity"/>
+				<labels rb="0..*"/>
 				<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_10FDE910_8BBC_40cf_9554_B5D06E8DEBAA">
+				<source xmi:idref="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198">
+					<model ea_localid="1629" type="Class" name="epo:FinancialOffer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
+					<model ea_localid="2625" type="Class" name="epo:Offer"/>
+					<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="2755"/>
+				<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_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_D4216826_2B82_4f98_BB11_ACD4AFBD9119">
+				<source xmi:idref="EAID_640F316F_44B1_44a6_9B37_FD17A852946F">
+					<model ea_localid="1630" type="Class" name="epo:TechnicalOffer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
-					<role name="epo:hasCertification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF">
+					<model ea_localid="2625" type="Class" name="epo:Offer"/>
+					<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="4576"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2756"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<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"/>
-				<extendedProperties/>
+				<labels/>
+				<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_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/>
@@ -39582,9 +41790,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_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"/>
@@ -39593,46 +41801,47 @@
 					<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="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:hasBuyerLegalType"/>
+				<labels rb="0..1" rt="+epo-ord:concernsOriginatorRequest"/>
 				<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_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_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_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="4118"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<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..*" rt="+epo:hasTaxIdentifier"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -39778,9 +41987,9 @@
 				<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_131426FE_407B_41cc_8545_0E43CC2AD3BA">
+				<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/>
@@ -39790,10 +41999,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_640F316F_44B1_44a6_9B37_FD17A852946F">
+					<model ea_localid="1630" type="Class" name="epo:TechnicalOffer"/>
+					<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;"/>
@@ -39801,21 +42010,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3128"/>
+				<model ea_localid="2826"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="Relation indicating the Purpose of a concept."/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasPurpose"/>
+				<labels rb="1" rt="+epo:isSupportedBy"/>
 				<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_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/>
@@ -39825,64 +42034,133 @@
 					<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"/>
+				<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"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
+					<documentation/>
+					<xrefs/>
+					<tags/>
+				</target>
+				<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:hasSubcontracting"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;"/>
-					<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="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..*" rt="+epo:hasItemCountryOfOrigin"/>
+				<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"/>
+					<role visibility="Public" targetScope="instance"/>
+					<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_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;Owned=0;Navigable=Navigable;"/>
+					<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="1361"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<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."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasLegalBasis"/>
+				<labels rb="0..1" rt="+epo:hasFinancialOfferValue"/>
 				<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_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;"/>
+					<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_2447F736_4669_4bd5_B117_6B8C8C53C370">
+					<model ea_localid="1628" type="Class" name="epo:ESPDResponse"/>
+					<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;"/>
+					<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="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/>
+				<labels rb="1" rt="+epo:isSupportedBy"/>
 				<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_F039FB34_0EE7_4244_8378_D6711720B09B">
+				<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/>
@@ -39892,10 +42170,10 @@
 					<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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_DAD55A5D_5BAE_481b_950B_5CDC98F0F198">
+					<model ea_localid="1629" type="Class" name="epo:FinancialOffer"/>
+					<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;"/>
@@ -39903,55 +42181,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4441"/>
+				<model ea_localid="2827"/>
 				<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="1" rt="+epo:isSupportedBy"/>
 				<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"/>
-					<role visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+			<connector xmi:idref="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<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;Navigable=Non-Navigable;Owned=0;Union=0;"/>
 					<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_811D4703_55F7_4d6e_B8D8_207479C15419">
+					<model ea_localid="958" type="Class" name="epo:Tender"/>
+					<role name="epo:includesTender" 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="AllowDuplicates=0;Derived=0;Navigable=Navigable;Owned=0;Union=0;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2936"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="1749"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Additional information:&#xA;This corresponds in eForms to BT-3202	 Contract Tender Identifier.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
-				<extendedProperties virtualInheritance="0"/>
+				<labels rb="0..*" rt="+epo:includesTender"/>
+				<extendedProperties/>
 				<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_E77DCB31_D48C_4ed8_A3AE_E3A1F6C743AB">
+				<source xmi:idref="EAID_20289A3C_51F0_43b4_8663_0B6367844B1B">
+					<model ea_localid="1892" type="Class" name="epo:ConcessionContract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39961,8 +42240,8 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
-					<model ea_localid="1717" type="Class" name="epo:ProcurementObject"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39972,7 +42251,7 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2659"/>
+				<model ea_localid="3075"/>
 				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
@@ -39983,9 +42262,9 @@
 				<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_1CBE1638_5876_4d85_8FFB_CD1622DAF44A">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -39995,10 +42274,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_0DF419BA_10D6_4bab_B947_0D8F652ACB31">
+					<model ea_localid="2905" type="Class" name="epo-con:Deliverable"/>
+					<role name="epo:specifiesDeliverable" 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;"/>
@@ -40006,21 +42285,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2780"/>
+				<model ea_localid="4452"/>
 				<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:setsGroupingContextForLot"/>
+				<labels rb="0..*" rt="+epo:specifiesDeliverable"/>
 				<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_3220FB6D_76C7_486a_9953_EA1E6D255A89">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40030,10 +42309,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:hasContractValue" 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;"/>
@@ -40041,21 +42320,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4647"/>
+				<model ea_localid="4456"/>
 				<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:refersToLot"/>
+				<labels rb="0..1" rt="+epo:hasContractValue"/>
 				<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_5514DE2C_F8BB_4c6f_9356_F67CF0DAA096">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40065,10 +42344,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_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;Owned=0;Navigable=Navigable;"/>
@@ -40076,56 +42355,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4641"/>
+				<model ea_localid="4694"/>
 				<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 rb="1..*" rt="+epo:announcesLot"/>
+				<labels rb="0..*" rt="+epo:isFundedBy"/>
 				<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_C741BADB_0CAC_40d5_A730_696A39D2224E">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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_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_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969">
+					<model ea_localid="1698" type="Class" name="epo:Duration"/>
+					<role name="epo:hasEstimatedDuration" 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="2783"/>
+				<model ea_localid="1610"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Relation indicating a Contract has an estimated Duration.&#xA;&#xA;Additional Information&#xA;&#xA;When the Lot uses a Technique the contract estimated duration applies to the Technique.&#xA;"/>
 				<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:hasEstimatedDuration"/>
 				<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_FBD708FC_CE05_4098_ADF6_2FEC3A1BB755">
+				<source xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40135,10 +42414,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_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="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;"/>
@@ -40146,21 +42425,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4480"/>
+				<model ea_localid="4636"/>
 				<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:refersToLot"/>
+				<labels rb="0..1" rt="+epo-ord:hasTaxInformation"/>
 				<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_1326915C_1564_403a_A96E_65DCEC3F641A">
+				<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/>
@@ -40170,10 +42449,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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:announcesCompletionOfContract" 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;"/>
@@ -40181,34 +42460,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2402"/>
+				<model ea_localid="4484"/>
 				<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:announcesLot"/>
+				<labels rb="1" rt="+epo:announcesCompletionOfContract"/>
 				<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_33EB6ABB_DB35_4b96_9E46_695F79EE21E5">
+				<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;Owned=0;Navigable=Unspecified;"/>
 					<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"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:refersToContractToBeModified" 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;"/>
@@ -40216,103 +42495,103 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2607"/>
+				<model ea_localid="1605"/>
 				<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:refersToLot"/>
+				<labels rb="1" rt="+epo:refersToContractToBeModified"/>
 				<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_3675E499_10A4_457e_9458_83E0C40CEC9A">
+				<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="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_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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<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="1467"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1409"/>
+				<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:hasProcurementScopeDividedIntoLot"/>
+				<labels/>
 				<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_37C1B1D3_F31C_482d_82B0_7ED4BAC17D43">
+				<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_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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:announcesContract" 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="2660"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4645"/>
+				<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:announcesContract"/>
 				<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_4A2A2E13_AE75_4b0d_B325_4443E0BF6A2D">
+				<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=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"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:announcesContract" 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;"/>
@@ -40320,69 +42599,68 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1441"/>
+				<model ea_localid="4638"/>
 				<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..*" rt="+epo:announcesContract"/>
 				<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_7787587B_6BE4_4863_801D_DFF3EA946B55">
+				<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/>
 					<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:hasPlannedDuration" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<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="2891"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4573"/>
+				<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:hasPlannedDuration"/>
+				<labels/>
 				<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_7E9B4B6E_15E8_4ec4_876B_BEE9D986B4DA">
+				<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/>
 					<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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo:amendsContract" 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;"/>
@@ -40390,21 +42668,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1433"/>
+				<model ea_localid="4721"/>
 				<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="1" rt="+epo:amendsContract"/>
 				<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_7F8C9069_9D3F_4494_8C14_7C6DA83E8A46">
+				<source xmi:idref="EAID_3B0D0A49_89AC_495b_B909_CD8CC73898DE">
+					<model ea_localid="3002" type="Class" name="epo:DirectContract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40414,8 +42692,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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40425,9 +42703,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4560"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4594"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -40436,9 +42714,9 @@
 				<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_A79DC2F8_C373_4894_AF6D_C4779365607A">
+				<source xmi:idref="EAID_1D470B74_66C6_4e95_82A9_28C6309EBB94">
+					<model ea_localid="2360" type="Class" name="epo-ord:ContractInformation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40448,9 +42726,9 @@
 					<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"/>
+				<target xmi:idref="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo-ord:concernsContract" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -40459,67 +42737,68 @@
 					<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="3641"/>
+				<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:hasProcedureType"/>
+				<labels rb="1" rt="+epo-ord:concernsContract"/>
 				<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_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A">
+				<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/>
 					<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_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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<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="2604"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1528"/>
+				<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:refersToProcedure"/>
+				<labels/>
 				<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_BC94D054_08DB_4bb5_A279_498213B45F8E">
+				<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/>
 					<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_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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo-cat:isSubordinatedToContract" 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;"/>
@@ -40527,21 +42806,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4487"/>
+				<model ea_localid="1759"/>
 				<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:isSubordinatedToContract"/>
 				<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_F2F64E25_5DAC_4cec_8EE0_33C8C2F66C12">
+				<source xmi:idref="EAID_96EED922_55C7_4a0c_BE58_68CD6D875556">
+					<model ea_localid="2008" type="Class" name="epo-ord:OrderResponse"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -40551,10 +42830,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_76E69B0B_4A6E_4901_8372_75A07B6AB066">
+					<model ea_localid="867" type="Class" name="epo:Contract"/>
+					<role name="epo-ord:implementsContract" 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;"/>
@@ -40562,34 +42841,34 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2872"/>
+				<model ea_localid="3259"/>
 				<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:announcesProcedure"/>
+				<labels rb="0..1" rt="+epo-ord:implementsContract"/>
 				<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_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_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_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;"/>
@@ -40597,21 +42876,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2401"/>
+				<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="1" rt="+epo:announcesProcedure"/>
+				<labels rb="0..1" rt="+epo:followsRulesSetBy"/>
 				<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_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/>
@@ -40621,10 +42900,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_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="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -40632,21 +42911,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4485"/>
-				<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="1" rt="+epo:refersToProcedure"/>
+				<labels rb="0..1" rt="+epo:hasFundProgramme"/>
 				<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_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/>
@@ -40667,11 +42944,11 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4688"/>
+				<model ea_localid="3014"/>
 				<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="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"/>
@@ -40679,44 +42956,43 @@
 				<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_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:refersToLotGroup" 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="4656"/>
-				<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..*" rt="+epo:refersToLotGroup"/>
+				<labels/>
 				<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_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/>
@@ -40726,10 +43002,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:isSubjectToGrouping" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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;"/>
@@ -40737,21 +43013,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2781"/>
+				<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..1" rt="+epo:isSubjectToGrouping"/>
+				<labels rb="1" rt="+epo:resolvesReviewRequest"/>
 				<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_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/>
@@ -40761,9 +43037,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_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"/>
@@ -40772,21 +43048,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2426"/>
-				<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:announcesLotGroup"/>
+				<labels rb="0..*" rt="+epo:providesRulingOnRemedy"/>
 				<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_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/>
@@ -40796,10 +43070,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:refersToLotGroup" 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: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;Owned=0;Navigable=Navigable;"/>
@@ -40807,21 +43081,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2617"/>
+				<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 rb="0..*" rt="+epo:refersToLotGroup"/>
+				<labels rb="0..1" rt="+epo:hasRemedyValue"/>
 				<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/>
@@ -40831,9 +43105,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"/>
@@ -40842,21 +43116,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/>
@@ -40866,10 +43138,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;"/>
@@ -40877,21 +43149,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_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/>
@@ -40901,10 +43171,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:refersToLotGroup" 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: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;"/>
@@ -40912,69 +43182,68 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4648"/>
+				<model ea_localid="2846"/>
 				<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-785 &quot;Review Previous Identifier&quot;."/>
 				<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:refersToPreviousReview"/>
 				<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_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_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_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="4663"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<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:hasInternalIdentifier"/>
+				<labels/>
 				<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_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/>
 					<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_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_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;"/>
@@ -40982,56 +43251,55 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1423"/>
+				<model ea_localid="4654"/>
 				<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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasEstimatedValue"/>
+				<labels rb="1..*" rt="+epo:announcesReviewObject"/>
 				<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_D16E8CBE_1896_4301_B20D_B5228F72117A">
+				<source xmi:idref="EAID_75076B9E_4981_457b_A408_99FB12AC4BBF">
+					<model ea_localid="1712" 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="adms:identifier" 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 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="3021"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="3134"/>
+				<properties ea_type="NoteLink" 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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+adms:identifier"/>
+				<labels/>
 				<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_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/>
@@ -41041,10 +43309,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_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;"/>
@@ -41052,21 +43320,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2883"/>
-				<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;"/>
+				<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;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasTotalQuantity"/>
+				<labels rb="1..*" rt="+epo:hasAllegedIrregularityType"/>
 				<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_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/>
@@ -41076,10 +43342,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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -41087,19 +43353,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1407"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<model ea_localid="2851"/>
+				<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."/>
 				<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:hasReviewRequestFee"/>
 				<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_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/>
@@ -41109,9 +43377,9 @@
 					<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"/>
+				<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"/>
@@ -41120,19 +43388,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1406"/>
+				<model ea_localid="2849"/>
 				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<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:hasAdditionalClassification"/>
+				<labels rb="0..*" rt="+epo:requestsRemedyType"/>
 				<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_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/>
@@ -41142,10 +43410,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_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;"/>
@@ -41153,19 +43421,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4722"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<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="0..1" rt="+epo:hasSubcontracting"/>
+				<labels rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
 				<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_B2FED202_9ACA_415c_B2AB_A1E3E26E726C">
+				<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/>
@@ -41175,65 +43445,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:hasItemCountryOfOrigin" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7">
+					<model ea_localid="1009" type="Enumeration" name="at-voc:change-corrig-justification"/>
+					<role name="epo:hasChangeJustification" 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 motives for the change.&#xA;&#xA;WG 5/11/2019&#xA;&#xA;The codelist to be used is at-voc:change-corrig-justification which is available at &#xA;http://publications.europa.eu/resource/dataset/change-corrig-justification"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1510"/>
+				<model ea_localid="1637"/>
 				<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="Code explaining the change.&#xA;&#xA;WG Approval 5/11/2019&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..*" rt="+epo:hasItemCountryOfOrigin"/>
+				<labels rb="1" rt="+epo:hasChangeJustification"/>
 				<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_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;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_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;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"/>
+				<model ea_localid="4687"/>
+				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
-				<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_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_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/>
@@ -41243,9 +43512,9 @@
 					<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"/>
+				<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"/>
@@ -41254,21 +43523,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2866"/>
+				<model ea_localid="4735"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<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 rb="1..*" rt="+epo:relatesToEFormSectionIdentifier"/>
 				<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_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/>
@@ -41278,9 +43547,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_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"/>
@@ -41289,21 +43558,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="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 rb="1" rt="+epo:hasTotalValue"/>
+				<labels rb="1" rt="+epo:hasNonPublicationJustification"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_056C94FE_E7B7_428e_B87E_F0795660EA2B">
-				<source xmi:idref="EAID_FD5AFD35_F06C_4d1c_B200_94202420C754">
-					<model ea_localid="1062" type="Class" name="epo-cat:Item"/>
+			<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/>
@@ -41313,30 +43580,32 @@
 					<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-cat:hasCountryOfOrigin" visibility="Public" targetScope="instance"/>
+				<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 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/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2642"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<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="+epo-cat:hasCountryOfOrigin"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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_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/>
@@ -41346,10 +43615,10 @@
 					<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_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;"/>
@@ -41357,19 +43626,21 @@
 					<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="3020"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="The identifier for the instance of the concept based on a standard scheme.&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number). &#xA;&#xA;WG Approval 24/02/2022&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasCurrency"/>
+				<labels rb="0..*" rt="+epo:hasItemStandardID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_02CADF28_5E22_4c8c_ADEE_564AF6B23E84">
-				<source xmi:idref="EAID_615A685A_1B92_4dc4_BE13_02E5C83D1818">
-					<model ea_localid="3023" type="Object" name="pmc"/>
+			<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/>
@@ -41379,10 +43650,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41390,20 +43661,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4629"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3015"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="The manufacturer's identifier for the item.&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo:hasManufacturerID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_226C5680_5CFB_4e42_B896_114639E39EFC">
-				<source xmi:idref="EAID_213258E2_02A8_4ddc_968F_5A009262B286">
-					<model ea_localid="3022" type="Object" name="compl"/>
+			<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/>
@@ -41413,10 +43685,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41424,20 +43696,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4627"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4021"/>
+				<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:hasTraceID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_48528BAE_46A8_4718_8763_FC7CE1AE3572">
-				<source xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
-					<model ea_localid="1994" type="Object" name="result"/>
+			<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/>
@@ -41447,10 +43720,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41458,20 +43731,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3239"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_559ACCBE_1732_4be8_B1D4_D00EAAC53DC9">
-				<source xmi:idref="EAID_A6EEF31D_5057_444e_BE96_FFBC408C8C26">
-					<model ea_localid="1996" type="Object" name="change"/>
+			<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/>
@@ -41481,10 +43755,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41492,20 +43766,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3241"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_57A9926C_361F_4e2b_86AB_F860BD49469A">
-				<source xmi:idref="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC">
-					<model ea_localid="1992" type="Object" name="competition"/>
+			<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/>
@@ -41515,10 +43790,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41526,54 +43801,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3237"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:relatesToEFormSectionIdentifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<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"/>
+			<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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Non-Navigable;"/>
 					<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_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;"/>
+					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
 					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2105"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
+				<model ea_localid="4327"/>
+				<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:hasVehicleSegmentID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_765FB2B0_AE50_45c4_9615_1F0D6407D00D">
-				<source xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
-					<model ea_localid="1991" type="Object" name="planning"/>
+			<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/>
@@ -41583,10 +43860,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41594,20 +43871,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3236"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4034"/>
+				<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:hasFreightForwarderConsignmentID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_81A204AE_92F0_417b_BAA6_9E74F310B60A">
-				<source xmi:idref="EAID_B1D5DCE8_9154_4921_B499_166453B14A53">
-					<model ea_localid="1993" type="Object" name="dir-awa-pre"/>
+			<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/>
@@ -41617,10 +43895,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41628,20 +43906,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3238"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3019"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value=" The general identifier for the concept as defined by the seller.&#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:hasSellerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_C00CC846_B17D_4c33_B24B_D50DFB0E661A">
-				<source xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
-					<model ea_localid="1995" type="Object" name="cont-modif"/>
+			<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/>
@@ -41651,10 +43930,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41662,20 +43941,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3240"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_062347E1_F78F_43d5_ADE7_07C48E1E600D">
-				<source xmi:idref="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
-					<model ea_localid="1116" type="Object" name="Directive 81"/>
+			<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/>
@@ -41685,10 +43965,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41696,20 +43976,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1815"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4250"/>
+				<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:hasCarrierConsignmentID"/>
 				<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"/>
+			<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/>
@@ -41719,10 +44000,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41730,20 +44011,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1813"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4006"/>
+				<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-ful:hasVehicleID"/>
 				<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"/>
+			<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/>
@@ -41753,10 +44035,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41764,20 +44046,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1814"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3016"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasBatchID"/>
 				<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"/>
+			<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/>
@@ -41787,10 +44070,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41798,20 +44081,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2096"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4374"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasSerialID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E2227EB0_964E_4ca5_99FE_413E8655E126">
-				<source xmi:idref="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72">
-					<model ea_localid="1276" type="Object" name="(EU) 2015/1986"/>
+			<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/>
@@ -41821,10 +44105,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41832,20 +44116,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2097"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3419"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E4F802B6_E371_4b25_9741_4111A518F567">
-				<source xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
-					<model ea_localid="1113" type="Object" name="Directive 24"/>
+			<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/>
@@ -41855,10 +44140,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41866,20 +44151,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1812"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3998"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="Links a resource to an adms:Identifier class."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<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_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/>
@@ -41889,10 +44175,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_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;"/>
@@ -41900,19 +44186,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2428"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation/>
+				<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="1" rt="+epo:hasUnitCode"/>
+				<labels rb="0..1" rt="+adms:identifier"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
-				<source xmi:idref="EAID_202A4478_69CA_4398_9F7F_F93BA82536E7">
-					<model ea_localid="3086" type="Class" name="epo-con:ContractModificationInformation"/>
+			<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/>
@@ -41922,10 +44210,10 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<target xmi:idref="EAID_C39641DF_A778_418a_94EE_8405EFE534AF">
-					<model ea_localid="980" type="Enumeration" name="at-voc:modification-justification"/>
-					<role name="epo:hasModificationJustification" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -41933,19 +44221,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4684"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="Explanation of why a contract was modified.&#xA;&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:modification-justification which is available at http://publications.europa.eu/resource/dataset/modification-justification&#xA;&#xA;Additional Information&#xA;&#xA;This corresponds in Standard forms to Field VII.2.2.1 and VII.2.2.3 in F20 .&#xA;&#xA;This corresponds in eForms to BT-200.&#xA;&#xA;&#xA;"/>
+				<model ea_localid="3018"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
+				<parameterSubstitutions/>
+				<documentation value="This refers to the general identifier for the concept as defined by the manufacturer.&#xA;&#xA;&#xA;WG Approval 16/05/2023&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo:hasModificationJustification"/>
+				<labels rb="0..1" rt="+epo:hasManufacturerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_0F82C881_5303_421e_9405_54DA924166D6">
-				<source xmi:idref="EAID_FE100E92_7DB5_49f3_9658_D17EC6192F77">
-					<model ea_localid="1099" type="Object" name="can-desg"/>
+			<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/>
@@ -41955,10 +44245,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
@@ -41966,20 +44256,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1798"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3522"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<documentation value="This refers to the identifier for 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/>
+				<labels rb="0..1" rt="+epo:hasBuyerItemID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1B84B9F8_2911_4e2b_B1A7_F72513B4CE0D">
-				<source xmi:idref="EAID_6848E7DC_0D07_4ab1_AF37_52AE370DCFEF">
-					<model ea_localid="1101" type="Object" name="can-social"/>
+			<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/>
@@ -41989,10 +44280,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;Owned=0;Navigable=Navigable;"/>
@@ -42000,20 +44291,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1800"/>
-				<properties ea_type="Realisation" 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_1FE8735C_B26E_4d56_BB72_3A24A5CFC4A4">
-				<source xmi:idref="EAID_98353942_99DF_4d60_A891_FA4F1808024B">
-					<model ea_localid="1106" type="Object" name="cn-standard"/>
+			<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/>
@@ -42023,10 +44315,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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;"/>
@@ -42034,20 +44326,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1805"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4033"/>
+				<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:hasConsigneeConsignmentID"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_28677F89_06B8_4b2e_A531_3B4A54CA4085">
-				<source xmi:idref="EAID_26558DD7_F7F2_428a_9639_C6126EF61343">
-					<model ea_localid="1107" type="Object" name="pin-cfc-standard"/>
+			<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/>
@@ -42057,31 +44350,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<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"/>
+				<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="1806"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3058"/>
+				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
 				<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_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/>
@@ -42091,8 +44385,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_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/>
@@ -42102,9 +44396,9 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2104"/>
-				<properties ea_type="NoteLink" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3318"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
 				<labels/>
@@ -42113,31 +44407,31 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_3D1CE0F5_E093_4c9c_8D40_EA25E924261E">
-				<source xmi:idref="EAID_716DDAC3_3B02_4995_8186_A0A9CC5C2625">
-					<model ea_localid="1098" type="Object" name="subco"/>
+			<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="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_C07688A9_AAC8_4f60_A2CC_FA90C006C282">
-					<model ea_localid="1096" type="Enumeration" name="at-voc:notice-type"/>
+				<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="1797"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="3317"/>
+				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
@@ -42147,9 +44441,9 @@
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_4074D849_10EA_4f22_AD19_39B3C3D88AC3">
-				<source xmi:idref="EAID_A28E85B5_919D_438c_AD5D_BCC5C9355C2F">
-					<model ea_localid="1111" type="Object" name="pin-only"/>
+			<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/>
@@ -42159,10 +44453,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 visibility="Public" targetScope="instance"/>
-					<type aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42170,20 +44464,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1811"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
-				<parameterSubstitutions/>
-				<documentation/>
+				<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/>
+				<labels rb="0..1" rt="+epo:hasCurrency"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_43B256A4_F68F_4ec5_8A49_8CE6B85AC307">
-				<source xmi:idref="EAID_D13A0500_D235_4f3b_B4D9_2AD8219EEC1C">
-					<model ea_localid="1105" type="Object" name="cn-social"/>
+			<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/>
@@ -42193,10 +44486,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 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:isCalculatedOn" 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;"/>
@@ -42204,20 +44497,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1804"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_47C1ECEB_898B_456c_9FC2_2463E88B2CE6">
-				<source xmi:idref="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D">
-					<model ea_localid="1982" type="Object" name="pmc"/>
+			<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/>
@@ -42227,10 +44521,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 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:updatesContractValue" 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;"/>
@@ -42238,20 +44532,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3230"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo:updatesContractValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_65D84653_0495_4cba_9FE5_029E3BA7E81F">
-				<source xmi:idref="EAID_61FC3F77_34BE_43ab_924A_93C6CA3E47B6">
-					<model ea_localid="1109" type="Object" name="pin-cfc-social"/>
+			<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/>
@@ -42261,10 +44556,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 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:hasTotalTaxInclusiveAmount" 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;"/>
@@ -42272,20 +44567,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1808"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalTaxInclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_75D4AE75_5F98_4427_8C82_F77F0A6D0578">
-				<source xmi:idref="EAID_399E9FA4_D5C8_429a_9DB2_CD940C350FAA">
-					<model ea_localid="1100" type="Object" name="can-modif"/>
+			<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/>
@@ -42295,10 +44591,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 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: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;"/>
@@ -42306,20 +44602,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1799"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalTaxExclusiveAmount"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_79AC279B_2E20_4acd_95FC_76D2A62AB8A5">
-				<source xmi:idref="EAID_0C95DCDD_128C_4045_8B05_B8D28E22ABB2">
-					<model ea_localid="1110" type="Object" name="pin-rtl"/>
+			<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/>
@@ -42329,10 +44626,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 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;Owned=0;Navigable=Navigable;"/>
@@ -42340,20 +44637,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1809"/>
-				<properties ea_type="Realisation" 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;&#xA;This is a logistics information needed for logistics, security measures, customs check, etc."/>
 				<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_887F5705_5AF4_43d5_A613_7C8C441760C8">
-				<source xmi:idref="EAID_E783D355_F9AE_40e5_AEC0_4873E54CC637">
-					<model ea_localid="1103" type="Object" name="veat"/>
+			<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/>
@@ -42363,10 +44661,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 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:isCalculatedOn" 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;"/>
@@ -42374,20 +44672,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1802"/>
-				<properties ea_type="Realisation" 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/>
+				<labels rb="0..1" rt="+epo:isCalculatedOn"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_8EBC034A_7536_4c7a_9358_0CC5DB29EFF0">
-				<source xmi:idref="EAID_6954DAFE_4925_4184_B77B_7298AE5C46FB">
-					<model ea_localid="1097" type="Object" name="brin-ecs"/>
+			<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/>
@@ -42397,10 +44696,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 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;Owned=0;Navigable=Navigable;"/>
@@ -42408,20 +44707,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1796"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4254"/>
+				<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:hasConsignmentFreeOnBoardValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_A1B41C97_D488_4b52_AD90_A4E0F559D6FB">
-				<source xmi:idref="EAID_9C1DF7E6_0F15_4005_A914_BD637F140881">
-					<model ea_localid="3080" type="Object" name="compl"/>
+			<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/>
@@ -42431,10 +44731,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 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;Owned=0;Navigable=Navigable;"/>
@@ -42442,20 +44742,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4727"/>
-				<properties ea_type="Realisation" 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_C28E02C7_8077_4d35_9146_AEDF3242A530">
-				<source xmi:idref="EAID_FBAA58B4_D48D_4ed0_B554_42683E4959B0">
-					<model ea_localid="1104" type="Object" name="cn-desg"/>
+			<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/>
@@ -42465,10 +44766,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 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;Owned=0;Navigable=Navigable;"/>
@@ -42476,20 +44777,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1803"/>
-				<properties ea_type="Realisation" 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_E32C5716_B4A8_4778_A515_25FF5BF85D76">
-				<source xmi:idref="EAID_0D6BFEEC_649E_4c20_8CD2_0801F85D499E">
-					<model ea_localid="1108" type="Object" name="pin-buyer"/>
+			<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/>
@@ -42499,31 +44801,32 @@
 					<xrefs/>
 					<tags/>
 				</source>
-				<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"/>
+				<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="1807"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<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/>
+				<labels rb="1" rt="+epo-cat:hasNetMonetaryValue"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E96B2292_A1A4_43f7_A350_C34A41186045">
-				<source xmi:idref="EAID_62883740_6F33_4322_9F81_C66BE332931F">
-					<model ea_localid="1112" type="Object" name="qu-sy"/>
+			<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/>
@@ -42533,10 +44836,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 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;Owned=0;Navigable=Navigable;"/>
@@ -42544,20 +44847,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1810"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4463"/>
+				<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_F3C16331_96CF_4ebe_8CDD_A59BDB3A7402">
-				<source xmi:idref="EAID_2E4B796E_AB93_4fee_8E39_36253580041A">
-					<model ea_localid="1102" type="Object" name="can-standard"/>
+			<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/>
@@ -42567,10 +44871,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 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="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;"/>
@@ -42578,20 +44882,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1801"/>
-				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
+				<model ea_localid="4321"/>
+				<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&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels/>
+				<labels rb="0..1" rt="+epo-cat:hasAmount"/>
 				<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_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/>
@@ -42601,10 +44906,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_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;"/>
@@ -42612,19 +44917,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1443"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
-				<documentation value="&#xA;&#xA;"/>
+				<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 rb="1..*" rt="+epo:hasTimePeriod"/>
+				<labels rb="1" rt="+epo-ord:hasTotalLineAmount"/>
 				<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_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/>
@@ -42634,10 +44941,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_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;"/>
@@ -42645,19 +44952,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="2889"/>
-				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<model ea_localid="4310"/>
+				<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="+time:unitType"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalAllowanceAmount"/>
 				<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_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/>
@@ -42667,10 +44976,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_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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -42678,21 +44987,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3984"/>
+				<model ea_localid="4022"/>
 				<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-ful:hasDeclaredStatisticalValue"/>
 				<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_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/>
@@ -42702,9 +45011,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:hasItemStandardID" 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:hasRoundingAmount" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42713,21 +45022,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3020"/>
+				<model ea_localid="4313"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="The identifier for the instance of the concept based on a standard scheme.&#xA;&#xA;Additional information: &#xA;For example the GTIN scheme (Global Trade Item Number). &#xA;&#xA;WG Approval 24/02/2022&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasItemStandardID"/>
+				<labels rb="0..1" rt="+epo-ord:hasRoundingAmount"/>
 				<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_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/>
@@ -42737,9 +45046,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:hasManufacturerID" 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:hasPrepaidAmount" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42748,21 +45057,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3015"/>
+				<model ea_localid="4312"/>
 				<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..1" rt="+epo-ord:hasPrepaidAmount"/>
 				<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_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/>
@@ -42772,10 +45081,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:hasTraceID" 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: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;"/>
@@ -42783,21 +45092,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4021"/>
+				<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 rb="0..1" rt="+epo-ful:hasTraceID"/>
+				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
 				<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_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/>
@@ -42807,9 +45116,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_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"/>
@@ -42818,21 +45127,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4001"/>
+				<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="+adms:identifier"/>
+				<labels rb="0..1" rt="+epo-ord:hasTotalChargeAmount"/>
 				<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_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/>
@@ -42842,10 +45151,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_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;"/>
@@ -42853,21 +45162,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="1443"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="&#xA;&#xA;"/>
 				<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:hasTimePeriod"/>
 				<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_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/>
@@ -42877,9 +45184,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_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"/>
@@ -42888,56 +45195,56 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4740"/>
+				<model ea_localid="3423"/>
 				<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"/>
+				<labels rb="0..1" rt="+epo-ful:hasEstimatedDeliveryPeriod"/>
 				<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_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="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:hasVehicleSegmentID" 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="4327"/>
+				<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 rb="0..1" rt="+epo-ful:hasVehicleSegmentID"/>
+				<labels rb="1" rt="+epo-cat:hasPriceValidity"/>
 				<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_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/>
@@ -42947,9 +45254,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_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"/>
@@ -42958,33 +45265,33 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4034"/>
+				<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-ful:hasFreightForwarderConsignmentID"/>
+				<labels rb="0..1" rt="+epo-ord:hasDeliveryPeriod"/>
 				<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_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/>
 					<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:hasSellerItemID" 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-cat:hasCatalogueLineValidity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -42993,21 +45300,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3019"/>
+				<model ea_localid="1754"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value=" The general identifier for the concept as defined by the seller.&#xA;&#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:hasSellerItemID"/>
+				<labels rb="0..1" rt="+epo-cat:hasCatalogueLineValidity"/>
 				<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_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/>
@@ -43017,9 +45324,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_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"/>
@@ -43028,21 +45335,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4000"/>
+				<model ea_localid="3281"/>
 				<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..1" rt="+epo-ord:hasDeliveryPeriod"/>
 				<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_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/>
@@ -43052,10 +45359,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:hasCarrierConsignmentID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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;"/>
@@ -43063,21 +45370,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4250"/>
-				<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..1" rt="+epo-ful:hasCarrierConsignmentID"/>
+				<labels rb="1" rt="+epo:hasUnitCode"/>
 				<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_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/>
@@ -43087,10 +45392,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_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;"/>
@@ -43098,21 +45403,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4006"/>
+				<model ea_localid="3436"/>
 				<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-ful:hasVehicleID"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<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_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/>
@@ -43122,9 +45427,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:hasBatchID" 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"/>
@@ -43133,21 +45438,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3016"/>
+				<model ea_localid="4043"/>
 				<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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasBatchID"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<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_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/>
@@ -43157,10 +45462,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:hasSerialID" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..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: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;"/>
@@ -43168,21 +45473,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4374"/>
+				<model ea_localid="3279"/>
 				<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;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo:hasSerialID"/>
+				<labels rb="1" rt="+epo-cat:hasQuantity"/>
 				<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"/>
+			<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/>
@@ -43192,9 +45497,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:hasLength" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43203,21 +45508,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3419"/>
+				<model ea_localid="4048"/>
 				<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..1" rt="+epo-ful:hasLength"/>
 				<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_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/>
@@ -43227,30 +45532,30 @@
 					<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-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="3998"/>
+				<model ea_localid="3057"/>
 				<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..1" rt="+epo-cat:hasQuantityThreshold"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_DA6CF0A4_BDFE_4be4_BDD9_5E0D69EFDD3D">
+			<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"/>
@@ -43262,9 +45567,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:hasGrossVolume" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43273,19 +45578,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4003"/>
+				<model ea_localid="3431"/>
 				<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..1" rt="+epo-ful:hasGrossVolume"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_E507D198_1A41_4b43_873A_F9E88411186D">
+			<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"/>
@@ -43297,9 +45602,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:hasManufacturerItemID" 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:hasNetQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43308,21 +45613,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3018"/>
+				<model ea_localid="3027"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="This refers to the general identifier for the concept as defined by the manufacturer.&#xA;&#xA;&#xA;WG Approval 16/05/2023&#xA;&#xA;"/>
+				<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="0..1" rt="+epo:hasManufacturerItemID"/>
+				<labels rb="0..1" rt="+epo-cat:hasNetQuantity"/>
 				<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_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/>
@@ -43332,9 +45637,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_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"/>
@@ -43343,21 +45648,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3522"/>
+				<model ea_localid="4251"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation value="This refers to the identifier for 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:hasBuyerItemID"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetWeight"/>
 				<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_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/>
@@ -43367,9 +45672,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_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"/>
@@ -43378,19 +45683,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3982"/>
+				<model ea_localid="4252"/>
 				<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:hasTrackingID"/>
+				<labels rb="0..1" rt="+epo-ful:hasChargeableWeight"/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_F3CD32F8_8180_4939_A987_53BA66264912">
+			<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"/>
@@ -43402,9 +45707,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:hasConsigneeConsignmentID" 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:hasTransportHandlingUnitQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43413,21 +45718,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4033"/>
+				<model ea_localid="3985"/>
 				<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:hasConsigneeConsignmentID"/>
+				<labels rb="0..1" rt="+epo-ful:hasTransportHandlingUnitQuantity"/>
 				<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_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/>
@@ -43437,100 +45742,102 @@
 					<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"/>
-					<type multiplicity="0..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;"/>
-					<documentation value="&#xA;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3058"/>
+				<model ea_localid="3426"/>
 				<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"/>
+				<documentation value="Quantity despatched for delivered."/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasExpectedDeliveryTime"/>
+				<labels rb="1" rt="+epo-ful:hasDespatchedQuantity"/>
 				<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_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_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_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="3318"/>
-				<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/>
 				<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_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_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/>
 					<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_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"/>
-					<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="3317"/>
-				<properties ea_type="Generalization" direction="Source -&gt; Destination"/>
+				<model ea_localid="4050"/>
+				<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:hasWidth"/>
 				<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_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/>
@@ -43540,9 +45847,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:isCalculatedOn" 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:hasQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43551,21 +45858,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4245"/>
+				<model ea_localid="4454"/>
 				<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/>
 				<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="+epo-cat:hasQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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_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/>
@@ -43575,9 +45882,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:hasRestatedContractValue" 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"/>
@@ -43586,21 +45893,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4724"/>
+				<model ea_localid="4049"/>
 				<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:hasRestatedContractValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasHeight"/>
 				<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_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/>
@@ -43610,9 +45917,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-ord:hasTotalTaxInclusiveAmount" 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"/>
@@ -43621,21 +45928,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4309"/>
+				<model ea_localid="3421"/>
 				<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:hasTotalTaxInclusiveAmount"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossVolume"/>
 				<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"/>
+			<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/>
@@ -43645,9 +45952,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-ord:hasTotalTaxExclusiveAmount" 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:hasOutstandingQuantity" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
 					<constraints/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
@@ -43656,21 +45963,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4308"/>
+				<model ea_localid="3427"/>
 				<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:hasTotalTaxExclusiveAmount"/>
+				<labels rb="0..1" rt="+epo-ful:hasOutstandingQuantity"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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_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/>
@@ -43680,9 +45987,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_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"/>
@@ -43691,21 +45998,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4052"/>
+				<model ea_localid="3060"/>
 				<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="The quantity at which the net monetary value applies."/>
 				<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-cat:hasBaseQuantity"/>
 				<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_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/>
@@ -43715,32 +46022,32 @@
 					<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_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="4322"/>
+				<model ea_localid="3056"/>
 				<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/>
 				<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="+epo-cat:hasOrderabableUnitFactorRate"/>
 				<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_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/>
@@ -43750,9 +46057,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_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"/>
@@ -43761,21 +46068,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4254"/>
+				<model ea_localid="4046"/>
 				<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:hasConsignmentFreeOnBoardValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasMaximumTemperature"/>
 				<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_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/>
@@ -43785,10 +46092,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-cat:hasAmount" 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;"/>
@@ -43796,21 +46103,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3213"/>
+				<model ea_localid="3168"/>
 				<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="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-cat:hasAmount"/>
+				<labels rb="0..1" rt="+epo-cat:hasQualifiedValue"/>
 				<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_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/>
@@ -43820,9 +46127,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_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"/>
@@ -43831,21 +46138,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4253"/>
+				<model ea_localid="4037"/>
 				<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:hasConsignmentDeclaredStatisticsValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<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_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/>
@@ -43855,32 +46162,32 @@
 					<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_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"/>
 					<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"/>
+				<model ea_localid="3026"/>
 				<properties ea_type="Association" direction="Source -&gt; Destination"/>
 				<modifiers isRoot="false" isLeaf="false"/>
 				<parameterSubstitutions/>
-				<documentation/>
+				<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="1" rt="+epo-cat:hasNetMonetaryValue"/>
+				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
 				<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_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/>
@@ -43890,9 +46197,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_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"/>
@@ -43901,21 +46208,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4463"/>
+				<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..1" rt="+epo:hasTotalValue"/>
+				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
 				<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_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/>
@@ -43925,9 +46232,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-cat:hasAmount" 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"/>
@@ -43936,21 +46243,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4321"/>
+				<model ea_localid="4045"/>
 				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasAmount"/>
+				<labels rb="0..1" rt="+epo-ful:hasMinimumTemperature"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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_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/>
@@ -43960,10 +46267,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_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;"/>
@@ -43971,21 +46278,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4307"/>
+				<model ea_localid="4036"/>
 				<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"/>
+				<labels rb="0..1" rt="+epo-ful:hasTotalGoodsItemQuantity"/>
 				<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_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/>
@@ -43995,9 +46302,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-ord:hasTotalAllowanceAmount" 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"/>
@@ -44006,21 +46313,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4310"/>
+				<model ea_localid="3420"/>
 				<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:hasTotalAllowanceAmount"/>
+				<labels rb="0..1" rt="+epo-ful:hasGrossWeight"/>
 				<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_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/>
@@ -44030,10 +46337,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-ful:hasDeclaredStatisticalValue" 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: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;"/>
@@ -44041,21 +46348,21 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4022"/>
+				<model ea_localid="4042"/>
 				<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-ful:hasDeclaredStatisticalValue"/>
+				<labels rb="0..1" rt="+epo-ful:hasNetVolume"/>
 				<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"/>
+			<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/>
@@ -44065,10 +46372,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:hasRoundingAmount" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<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"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44076,21 +46383,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4313"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<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="0..1" rt="+epo-ord:hasRoundingAmount"/>
+				<labels rb="1" rt="+time:unitType"/>
 				<extendedProperties virtualInheritance="0"/>
 				<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_056C94FE_E7B7_428e_B87E_F0795660EA2B">
+				<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/>
@@ -44100,32 +46405,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-ord:hasPrepaidAmount" 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-cat:hasCountryOfOrigin" 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 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;"/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4312"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="2642"/>
+				<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:hasPrepaidAmount"/>
+				<labels rb="0..1" rt="+epo-cat:hasCountryOfOrigin"/>
 				<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_02CADF28_5E22_4c8c_ADEE_564AF6B23E84">
+				<source xmi:idref="EAID_615A685A_1B92_4dc4_BE13_02E5C83D1818">
+					<model ea_localid="3023" type="Object" name="pmc"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44135,10 +46438,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_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/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44146,21 +46449,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4314"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4629"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
 				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="1" rt="+epo-ord:hasAmountDueForPayment"/>
+				<labels/>
 				<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_226C5680_5CFB_4e42_B896_114639E39EFC">
+				<source xmi:idref="EAID_213258E2_02A8_4ddc_968F_5A009262B286">
+					<model ea_localid="3022" type="Object" name="compl"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44170,10 +46472,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_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/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44181,21 +46483,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4311"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4627"/>
+				<properties ea_type="Realisation" 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:hasTotalChargeAmount"/>
+				<labels/>
 				<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_48528BAE_46A8_4718_8763_FC7CE1AE3572">
+				<source xmi:idref="EAID_FD652F49_B5E1_4a29_B59C_B38E907B03B5">
+					<model ea_localid="1994" type="Object" name="result"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44205,10 +46506,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-ful:hasEstimatedDeliveryPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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 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;"/>
@@ -44216,21 +46517,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3423"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3239"/>
+				<properties ea_type="Realisation" 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:hasEstimatedDeliveryPeriod"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
 				<tags/>
 			</connector>
-			<connector xmi:idref="EAID_1864913C_FE85_48db_829F_004DFE769A97">
-				<source xmi:idref="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39">
-					<model ea_localid="1952" type="Class" name="epo-cat:Certificate"/>
+			<connector xmi:idref="EAID_559ACCBE_1732_4be8_B1D4_D00EAAC53DC9">
+				<source xmi:idref="EAID_A6EEF31D_5057_444e_BE96_FFBC408C8C26">
+					<model ea_localid="1996" type="Object" name="change"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44240,10 +46540,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:hasValidityPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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 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;"/>
@@ -44251,104 +46551,101 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3202"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3241"/>
+				<properties ea_type="Realisation" 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_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_57A9926C_361F_4e2b_86AB_F860BD49469A">
+				<source xmi:idref="EAID_7AE1E1F8_4307_42d5_9188_3E6E717CA7EC">
+					<model ea_localid="1992" type="Object" name="competition"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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-cat:hasPriceValidity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="1" 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 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;"/>
+					<documentation/>
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1755"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3237"/>
+				<properties ea_type="Realisation" 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_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/>
 					<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-ord:hasDeliveryPeriod" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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 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="4763"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="2105"/>
+				<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-ord:hasDeliveryPeriod"/>
+				<labels/>
 				<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_765FB2B0_AE50_45c4_9615_1F0D6407D00D">
+				<source xmi:idref="EAID_469C2FE3_27EF_4ee8_B51B_A85934282E9E">
+					<model ea_localid="1991" type="Object" name="planning"/>
 					<role visibility="Public" targetScope="instance"/>
 					<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-cat:hasCatalogueLineValidity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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 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;"/>
@@ -44356,21 +46653,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="1754"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3236"/>
+				<properties ea_type="Realisation" 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-cat:hasCatalogueLineValidity"/>
+				<labels/>
 				<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_81A204AE_92F0_417b_BAA6_9E74F310B60A">
+				<source xmi:idref="EAID_B1D5DCE8_9154_4921_B499_166453B14A53">
+					<model ea_localid="1993" type="Object" name="dir-awa-pre"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44380,10 +46676,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_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/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44391,21 +46687,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3281"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3238"/>
+				<properties ea_type="Realisation" 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:hasDeliveryPeriod"/>
+				<labels/>
 				<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_C00CC846_B17D_4c33_B24B_D50DFB0E661A">
+				<source xmi:idref="EAID_E1A66893_1AEF_40f4_A0B4_6F131D298E9A">
+					<model ea_localid="1995" type="Object" name="cont-modif"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44415,10 +46710,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_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/>
 					<modifiers isOrdered="false" changeable="none" isNavigable="true"/>
 					<style value="Union=0;Derived=0;AllowDuplicates=0;Owned=0;Navigable=Navigable;"/>
@@ -44426,21 +46721,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3436"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3240"/>
+				<properties ea_type="Realisation" 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:hasGrossWeight"/>
+				<labels/>
 				<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_8A622D7F_F4A3_4934_91F5_54DFBCC7D484">
+				<source xmi:idref="EAID_3A26D4B3_0F2F_4513_90E4_F69631B6BEE6">
+					<model ea_localid="3103" type="Class" name="epo-acc:Legislation"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44450,10 +46744,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_1A66B07B_A8FD_481e_8217_0049EA327F90">
+					<model ea_localid="976" type="Enumeration" name="at-voc:language"/>
+					<role name="epo:hasOfficialLanguage" 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;"/>
@@ -44461,21 +46755,19 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4043"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
-				<parameterSubstitutions/>
+				<model ea_localid="4779"/>
+				<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:hasNetWeight"/>
+				<labels rt="+epo:hasOfficialLanguage"/>
 				<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_062347E1_F78F_43d5_ADE7_07C48E1E600D">
+				<source xmi:idref="EAID_89668AB6_A244_441e_B851_9289BD4E15F3">
+					<model ea_localid="1116" type="Object" name="Directive 81"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44485,10 +46777,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_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;"/>
@@ -44496,21 +46788,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3279"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1815"/>
+				<properties ea_type="Realisation" 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:hasQuantity"/>
+				<labels/>
 				<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_3AC3215E_68C1_470f_880A_9FAE9B53D8B9">
+				<source xmi:idref="EAID_F89732E3_0046_41b6_B90C_EF55511242C8">
+					<model ea_localid="1114" type="Object" name="Directive 24"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44520,10 +46811,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_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;"/>
@@ -44531,21 +46822,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4048"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1813"/>
+				<properties ea_type="Realisation" 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:hasLength"/>
+				<labels/>
 				<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_8E647BBA_AE2A_4ca3_9144_41548E3A43AB">
+				<source xmi:idref="EAID_777C8BDE_F15B_4544_AD29_7F3F7BD7460A">
+					<model ea_localid="1115" type="Object" name="Directive 25"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44555,32 +46845,31 @@
 					<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_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 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"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1814"/>
+				<properties ea_type="Realisation" 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-cat:hasQuantityThreshold"/>
+				<labels/>
 				<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_D3C680D4_3CB0_40f5_9D98_ED0E9C28B950">
+				<source xmi:idref="EAID_6C334A58_89F2_4d3e_98F6_902667A49E71">
+					<model ea_localid="1277" type="Object" name="(EU) 2019/1780"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44590,10 +46879,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_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;"/>
@@ -44601,21 +46890,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3431"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2096"/>
+				<properties ea_type="Realisation" 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_E2227EB0_964E_4ca5_99FE_413E8655E126">
+				<source xmi:idref="EAID_D6079364_9DE2_45de_9BAC_BE9D74F34B72">
+					<model ea_localid="1276" type="Object" name="(EU) 2015/1986"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44625,10 +46913,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:hasNetQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" 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 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;"/>
@@ -44636,21 +46924,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3027"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="2097"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_E4F802B6_E371_4b25_9741_4111A518F567">
+				<source xmi:idref="EAID_8E4FF705_88E9_4b3e_A98F_ACC159CC13C2">
+					<model ea_localid="1113" type="Object" name="Directive 24"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44660,10 +46947,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_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;"/>
@@ -44671,21 +46958,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4251"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1812"/>
+				<properties ea_type="Realisation" 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: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_E3F14E7C_46D7_4dec_BA75_DE0B948A3FD5">
+				<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/>
@@ -44695,10 +46981,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:hasChargeableWeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..1" aggregation="none" containment="Unspecified"/>
+				<target xmi:idref="EAID_C39641DF_A778_418a_94EE_8405EFE534AF">
+					<model ea_localid="980" type="Enumeration" name="at-voc:modification-justification"/>
+					<role name="epo:hasModificationJustification" 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;"/>
@@ -44706,21 +46992,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="4684"/>
+				<properties ea_type="Dependency" direction="Source -&gt; Destination"/>
+				<documentation value="Explanation of why a contract was modified.&#xA;&#xA;WG Approval 09/11/2021&#xA;&#xA;The codelist to be used is at-voc:modification-justification which is available at http://publications.europa.eu/resource/dataset/modification-justification&#xA;&#xA;Additional Information&#xA;&#xA;This corresponds in Standard forms to Field VII.2.2.1 and VII.2.2.3 in F20 .&#xA;&#xA;This corresponds in eForms to BT-200.&#xA;&#xA;&#xA;"/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-ful:hasChargeableWeight"/>
+				<labels rb="1" rt="+epo:hasModificationJustification"/>
 				<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_0F82C881_5303_421e_9405_54DA924166D6">
+				<source xmi:idref="EAID_FE100E92_7DB5_49f3_9658_D17EC6192F77">
+					<model ea_localid="1099" type="Object" name="can-desg"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44730,10 +47014,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_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;"/>
@@ -44741,21 +47025,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3985"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1798"/>
+				<properties ea_type="Realisation" 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:hasTransportHandlingUnitQuantity"/>
+				<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"/>
+			<connector xmi:idref="EAID_1B84B9F8_2911_4e2b_B1A7_F72513B4CE0D">
+				<source xmi:idref="EAID_6848E7DC_0D07_4ab1_AF37_52AE370DCFEF">
+					<model ea_localid="1101" type="Object" name="can-social"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44765,10 +47048,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:hasDespatchedQuantity" 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;"/>
@@ -44776,21 +47059,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3426"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1800"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_1FE8735C_B26E_4d56_BB72_3A24A5CFC4A4">
+				<source xmi:idref="EAID_98353942_99DF_4d60_A891_FA4F1808024B">
+					<model ea_localid="1106" type="Object" name="cn-standard"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44800,10 +47082,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_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;"/>
@@ -44811,21 +47093,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4035"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1805"/>
+				<properties ea_type="Realisation" 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:hasLoadingLength"/>
+				<labels/>
 				<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_28677F89_06B8_4b2e_A531_3B4A54CA4085">
+				<source xmi:idref="EAID_26558DD7_F7F2_428a_9639_C6126EF61343">
+					<model ea_localid="1107" type="Object" name="pin-cfc-standard"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44835,10 +47116,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_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;"/>
@@ -44846,56 +47127,54 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4050"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1806"/>
+				<properties ea_type="Realisation" 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:hasWidth"/>
+				<labels/>
 				<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_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_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_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="4454"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
+				<model ea_localid="2104"/>
+				<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-cat:hasQuantity"/>
+				<labels/>
 				<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_3D1CE0F5_E093_4c9c_8D40_EA25E924261E">
+				<source xmi:idref="EAID_716DDAC3_3B02_4995_8186_A0A9CC5C2625">
+					<model ea_localid="1098" type="Object" name="subco"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44905,10 +47184,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:hasHeight" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..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;"/>
@@ -44916,21 +47195,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4049"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1797"/>
+				<properties ea_type="Realisation" 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:hasHeight"/>
+				<labels/>
 				<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_4074D849_10EA_4f22_AD19_39B3C3D88AC3">
+				<source xmi:idref="EAID_A28E85B5_919D_438c_AD5D_BCC5C9355C2F">
+					<model ea_localid="1111" type="Object" name="pin-only"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44940,10 +47218,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_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;"/>
@@ -44951,21 +47229,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3421"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1811"/>
+				<properties ea_type="Realisation" 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_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_43B256A4_F68F_4ec5_8A49_8CE6B85AC307">
+				<source xmi:idref="EAID_D13A0500_D235_4f3b_B4D9_2AD8219EEC1C">
+					<model ea_localid="1105" type="Object" name="cn-social"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -44975,10 +47252,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:hasOutstandingQuantity" visibility="Public" targetScope="instance"/>
-					<type multiplicity="0..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;"/>
@@ -44986,21 +47263,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3427"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1804"/>
+				<properties ea_type="Realisation" 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:hasOutstandingQuantity"/>
+				<labels/>
 				<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_47C1ECEB_898B_456c_9FC2_2463E88B2CE6">
+				<source xmi:idref="EAID_53C53D83_424B_4038_AF6F_5B9C6F71226D">
+					<model ea_localid="1982" type="Object" name="pmc"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45010,10 +47286,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_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;"/>
@@ -45021,21 +47297,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3060"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="3230"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_65D84653_0495_4cba_9FE5_029E3BA7E81F">
+				<source xmi:idref="EAID_61FC3F77_34BE_43ab_924A_93C6CA3E47B6">
+					<model ea_localid="1109" type="Object" name="pin-cfc-social"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45045,32 +47320,31 @@
 					<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_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;"/>
-					<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"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1808"/>
+				<properties ea_type="Realisation" 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-cat:hasOrderabableUnitFactorRate"/>
+				<labels/>
 				<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_75D4AE75_5F98_4427_8C82_F77F0A6D0578">
+				<source xmi:idref="EAID_399E9FA4_D5C8_429a_9DB2_CD940C350FAA">
+					<model ea_localid="1100" type="Object" name="can-modif"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45080,10 +47354,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_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;"/>
@@ -45091,21 +47365,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4046"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1799"/>
+				<properties ea_type="Realisation" 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:hasMaximumTemperature"/>
+				<labels/>
 				<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_79AC279B_2E20_4acd_95FC_76D2A62AB8A5">
+				<source xmi:idref="EAID_0C95DCDD_128C_4045_8B05_B8D28E22ABB2">
+					<model ea_localid="1110" type="Object" name="pin-rtl"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45115,10 +47388,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_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;"/>
@@ -45126,21 +47399,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3168"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1809"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<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/>
 				<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_887F5705_5AF4_43d5_A613_7C8C441760C8">
+				<source xmi:idref="EAID_E783D355_F9AE_40e5_AEC0_4873E54CC637">
+					<model ea_localid="1103" type="Object" name="veat"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45150,10 +47422,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_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;"/>
@@ -45161,21 +47433,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4037"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1802"/>
+				<properties ea_type="Realisation" 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:hasTotalGoodsItemQuantity"/>
+				<labels/>
 				<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_8EBC034A_7536_4c7a_9358_0CC5DB29EFF0">
+				<source xmi:idref="EAID_6954DAFE_4925_4184_B77B_7298AE5C46FB">
+					<model ea_localid="1097" type="Object" name="brin-ecs"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45185,10 +47456,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_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;"/>
@@ -45196,21 +47467,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3026"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1796"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<parameterSubstitutions/>
-				<documentation value="The minimum quantity of an item that is guaranteed by the seller to be delivered.&#xA;&#xA;"/>
+				<documentation/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMinimumQuantityGuaranteedForDelivery"/>
+				<labels/>
 				<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_A1B41C97_D488_4b52_AD90_A4E0F559D6FB">
+				<source xmi:idref="EAID_9C1DF7E6_0F15_4005_A914_BD637F140881">
+					<model ea_localid="3080" type="Object" name="compl"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45220,10 +47490,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_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;"/>
@@ -45231,21 +47501,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3025"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="4727"/>
+				<properties ea_type="Realisation" direction="Source -&gt; Destination"/>
 				<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/>
 				<appearance linemode="3" linecolor="-1" linewidth="0" seqno="0" headStyle="0" lineStyle="0"/>
-				<labels rb="0..1" rt="+epo-cat:hasMaximumOrderQuantity"/>
+				<labels/>
 				<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_C28E02C7_8077_4d35_9146_AEDF3242A530">
+				<source xmi:idref="EAID_FBAA58B4_D48D_4ed0_B554_42683E4959B0">
+					<model ea_localid="1104" type="Object" name="cn-desg"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45255,10 +47524,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_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;"/>
@@ -45266,21 +47535,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4045"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1803"/>
+				<properties ea_type="Realisation" 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:hasMinimumTemperature"/>
+				<labels/>
 				<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_E32C5716_B4A8_4778_A515_25FF5BF85D76">
+				<source xmi:idref="EAID_0D6BFEEC_649E_4c20_8CD2_0801F85D499E">
+					<model ea_localid="1108" type="Object" name="pin-buyer"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45290,10 +47558,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_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;"/>
@@ -45301,21 +47569,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4036"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1807"/>
+				<properties ea_type="Realisation" 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:hasTotalGoodsItemQuantity"/>
+				<labels/>
 				<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_E96B2292_A1A4_43f7_A350_C34A41186045">
+				<source xmi:idref="EAID_62883740_6F33_4322_9F81_C66BE332931F">
+					<model ea_localid="1112" type="Object" name="qu-sy"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45325,10 +47592,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_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;"/>
@@ -45336,21 +47603,20 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="3420"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1810"/>
+				<properties ea_type="Realisation" 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:hasGrossWeight"/>
+				<labels/>
 				<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_F3C16331_96CF_4ebe_8CDD_A59BDB3A7402">
+				<source xmi:idref="EAID_2E4B796E_AB93_4fee_8E39_36253580041A">
+					<model ea_localid="1102" type="Object" name="can-standard"/>
 					<role visibility="Public" targetScope="instance"/>
 					<type aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -45360,10 +47626,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_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;"/>
@@ -45371,13 +47637,12 @@
 					<xrefs/>
 					<tags/>
 				</target>
-				<model ea_localid="4042"/>
-				<properties ea_type="Association" direction="Source -&gt; Destination"/>
-				<modifiers isRoot="false" isLeaf="false"/>
+				<model ea_localid="1801"/>
+				<properties ea_type="Realisation" 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:hasNetVolume"/>
+				<labels/>
 				<extendedProperties virtualInheritance="0"/>
 				<style/>
 				<xrefs/>
@@ -45387,14 +47652,13 @@
 		<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_xsd_boolean" name="xsd:boolean"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_PlainLiteral" name="rdf:PlainLiteral"/>
-					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_anyURI" name="xsd:anyURI"/>
-					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_rdf_langString" name="rdf:langString"/>
 					<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 xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_anyURI" name="xsd:anyURI"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_dateTime" name="xsd:dateTime"/>
 					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_integer" name="xsd:integer"/>
+					<packagedElement xmi:type="uml:PrimitiveType" xmi:id="EAJava_xsd_decimal" name="xsd:decimal"/>
 				</packagedElement>
 			</packagedElement>
 		</primitivetypes>
@@ -45453,9 +47717,9 @@
 			<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"/>
 				<properties name="epo overview" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-05-13 14:20:29" modified="2022-09-20 14:58:49"/>
+				<project author="lps" version="1.0" created="2022-05-13 14:20:29" modified="2023-09-11 16:40:04"/>
 				<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;OPTIONS_7DC840BA=InfoView=6:;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=3A81B5B6;"/>
+				<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;OPTIONS_7DC840BA=InfoView=6:;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=B4CF86C2;"/>
 				<swimlanes value="locked=false;orientation=1;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=200;SW2=200;SW3=200;SW4=1218;"/>
 				<matrixitems value="locked=false;matrixactive=false;swimlanesactive=true;kanbanactive=false;width=1;clrLine=0;"/>
 				<extendedProperties/>
@@ -45474,165 +47738,161 @@
 					<element geometry="Left=393;Top=790;Right=563;Bottom=905;" subject="EAID_24F90E61_753D_4cf6_8358_F904A686244F" seqno="12" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=795FBAEC;"/>
 					<element geometry="Left=205;Top=790;Right=375;Bottom=905;" subject="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1" seqno="13" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=02CA6782;"/>
 					<element geometry="Left=17;Top=790;Right=187;Bottom=905;" subject="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F" seqno="14" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=101670E2;"/>
-					<element geometry="Left=581;Top=642;Right=751;Bottom=757;" subject="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F" seqno="15" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=95A564EE;"/>
-					<element geometry="Left=393;Top=642;Right=563;Bottom=757;" subject="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6" seqno="16" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=158A6580;"/>
-					<element geometry="Left=772;Top=642;Right=942;Bottom=757;" subject="EAID_0B563D27_1575_48a5_8CFF_5424B393E918" seqno="17" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A75355BD;"/>
-					<element geometry="Left=398;Top=1093;Right=568;Bottom=1208;" subject="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0" seqno="18" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DB20A1DB;"/>
-					<element geometry="Left=210;Top=1093;Right=380;Bottom=1208;" subject="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500" seqno="19" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=915597F4;"/>
-					<element geometry="Left=958;Top=1093;Right=1128;Bottom=1208;" subject="EAID_0E2769F1_F27B_445a_A3EA_854B47E10131" seqno="20" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=256CCDB3;"/>
-					<element geometry="Left=769;Top=1093;Right=939;Bottom=1208;" subject="EAID_C51CEE38_0715_4c7f_A11A_33482161EFBA" seqno="21" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6120A70D;"/>
-					<element geometry="Left=582;Top=1093;Right=752;Bottom=1208;" subject="EAID_D328B002_DFC9_487f_A930_EAEFF23E8568" seqno="22" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=58E9F6A7;"/>
-					<element geometry="Left=17;Top=1092;Right=187;Bottom=1207;" subject="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43" seqno="23" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3C67A24D;"/>
-					<element geometry="Left=205;Top=941;Right=375;Bottom=1056;" subject="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113" seqno="24" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C785434E;"/>
-					<element geometry="Left=17;Top=941;Right=187;Bottom=1056;" subject="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20" seqno="25" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BDB51E4B;"/>
-					<element geometry="Left=205;Top=642;Right=375;Bottom=757;" subject="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2" seqno="26" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3AB85B3C;"/>
-					<element geometry="Left=17;Top=642;Right=187;Bottom=757;" subject="EAID_FA67183F_38CC_4aa6_945B_60FA54013A48" seqno="27" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AC20B51F;"/>
-					<element geometry="Left=579;Top=439;Right=749;Bottom=554;" subject="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" seqno="28" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7DC840BA;"/>
-					<element geometry="Left=395;Top=439;Right=565;Bottom=554;" subject="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B" seqno="29" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DB82467F;"/>
-					<element geometry="Left=211;Top=439;Right=381;Bottom=554;" subject="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1" seqno="30" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E22E6C0F;"/>
-					<element geometry="Left=27;Top=439;Right=197;Bottom=554;" subject="EAID_31EA4D18_AE52_4312_865E_AA3D8CABF489" seqno="31" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=FC43C821;"/>
-					<element geometry="Left=947;Top=247;Right=1117;Bottom=362;" subject="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17" seqno="32" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=59DEBEB2;ImageID=0;"/>
-					<element geometry="Left=763;Top=247;Right=933;Bottom=362;" subject="EAID_12170F5C_506A_44bf_A694_24FCCC3FFDA5" seqno="33" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C2A12172;ImageID=0;"/>
-					<element geometry="Left=579;Top=247;Right=749;Bottom=362;" subject="EAID_155C7FA7_6962_4810_AED6_D94302F09660" seqno="34" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C061D700;ImageID=0;"/>
-					<element geometry="Left=395;Top=247;Right=565;Bottom=362;" subject="EAID_D964D718_09AD_453d_9261_B680435DC8F5" seqno="35" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4921EE43;ImageID=0;"/>
-					<element geometry="Left=211;Top=247;Right=381;Bottom=362;" subject="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2" seqno="36" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=33660614;ImageID=0;"/>
-					<element geometry="Left=27;Top=247;Right=197;Bottom=362;" subject="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9" seqno="37" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1421D46A;ImageID=0;"/>
-					<element geometry="Left=27;Top=31;Right=197;Bottom=146;" subject="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702" seqno="38" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EB92250B;"/>
+					<element geometry="Left=774;Top=642;Right=944;Bottom=757;" subject="EAID_DF46765F_128C_4cd8_8E8A_A6EC221BAB4F" seqno="15" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=95A564EE;"/>
+					<element geometry="Left=581;Top=642;Right=751;Bottom=757;" subject="EAID_954E4827_D178_4ebc_9EE2_A6F61F870DB6" seqno="16" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=158A6580;"/>
+					<element geometry="Left=967;Top=642;Right=1137;Bottom=757;" subject="EAID_0B563D27_1575_48a5_8CFF_5424B393E918" seqno="17" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A75355BD;"/>
+					<element geometry="Left=393;Top=1092;Right=563;Bottom=1207;" subject="EAID_4C442DBD_D8E5_4d12_A2A1_A7DEA1E5A1B0" seqno="18" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DB20A1DB;"/>
+					<element geometry="Left=205;Top=1092;Right=375;Bottom=1207;" subject="EAID_DE4D587C_087C_40fa_B63D_56DEA2854500" seqno="19" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=915597F4;"/>
+					<element geometry="Left=17;Top=1092;Right=187;Bottom=1207;" subject="EAID_68D5E5EA_FC7A_4339_81EA_0B04F7E45A43" seqno="20" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3C67A24D;"/>
+					<element geometry="Left=205;Top=941;Right=375;Bottom=1056;" subject="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113" seqno="21" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C785434E;"/>
+					<element geometry="Left=17;Top=941;Right=187;Bottom=1056;" subject="EAID_A3FE9B4C_382E_40dc_958E_D9BF99277B20" seqno="22" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BDB51E4B;"/>
+					<element geometry="Left=205;Top=642;Right=375;Bottom=757;" subject="EAID_F889D07C_8647_44f2_9C6E_449B3E20BCF2" seqno="23" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=3AB85B3C;"/>
+					<element geometry="Left=17;Top=642;Right=187;Bottom=757;" subject="EAID_FA67183F_38CC_4aa6_945B_60FA54013A48" seqno="24" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AC20B51F;"/>
+					<element geometry="Left=395;Top=439;Right=565;Bottom=554;" subject="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34" seqno="25" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7DC840BA;"/>
+					<element geometry="Left=211;Top=439;Right=381;Bottom=554;" subject="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B" seqno="26" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=DB82467F;"/>
+					<element geometry="Left=27;Top=439;Right=197;Bottom=554;" subject="EAID_EED92360_39E2_48e3_93F3_A9FAE5CE18B1" seqno="27" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=E22E6C0F;HideIcon=0;"/>
+					<element geometry="Left=762;Top=247;Right=932;Bottom=362;" subject="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17" seqno="28" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=59DEBEB2;ImageID=0;"/>
+					<element geometry="Left=579;Top=247;Right=749;Bottom=362;" subject="EAID_155C7FA7_6962_4810_AED6_D94302F09660" seqno="29" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=C061D700;ImageID=0;"/>
+					<element geometry="Left=395;Top=247;Right=565;Bottom=362;" subject="EAID_D964D718_09AD_453d_9261_B680435DC8F5" seqno="30" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=4921EE43;ImageID=0;"/>
+					<element geometry="Left=211;Top=247;Right=381;Bottom=362;" subject="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2" seqno="31" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=33660614;ImageID=0;"/>
+					<element geometry="Left=27;Top=247;Right=197;Bottom=362;" subject="EAID_F990707E_C758_4479_B2F5_BD41CC5DDBC9" seqno="32" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1421D46A;ImageID=0;"/>
+					<element geometry="Left=27;Top=31;Right=197;Bottom=146;" subject="EAID_9E4FA39A_DB0C_4c05_BA06_515432E59702" seqno="33" style="font=Carlito;fontsz=140;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=EB92250B;"/>
 					<element geometry="width=200;" subject="EAID_69C2CDF5_BE35_4e09_8931_76BEC19487B2" style="swimlane;name=overview;class=;partition=1;description=OE0={9E4FA39A-DB0C-4c05-BA06-515432E59702}:;"/>
-					<element geometry="width=200;" subject="EAID_374A9D3C_9024_477e_A93F_9CC4739744E9" style="swimlane;name=phase views;class=;partition=2;description=OE0={F990707E-C758-4479-B2F5-BD41CC5DDBC9}:OE1={D6C95713-EB11-4af7-8A46-9B20895C7AD2}:OE2={D964D718-09AD-453d-9261-B680435DC8F5}:OE3={155C7FA7-6962-4810-AED6-D94302F09660}:OE4={12170F5C-506A-44bf-A694-24FCCC3FFDA5}:OE5={24A53112-91DE-40c0-B978-81AE2B81BF17}:;"/>
-					<element geometry="width=200;" subject="EAID_29E82798_63AE_4faf_A952_6C6A0933DE3B" style="swimlane;name=monetary values;class=;partition=3;description=OE0={31EA4D18-AE52-4312-865E-AA3D8CABF489}:OE1={EED92360-39E2-48e3-93F3-A9FAE5CE18B1}:OE2={C0FA4596-11C5-4b97-AB06-08AA082CD52B}:OE3={46C02EA3-5EA6-48ea-9F81-DB71EAB73C34}:;"/>
-					<element geometry="width=1218;" subject="EAID_9D12E2D2_3867_476f_ABB0_B0C6B362D4C5" style="swimlane;name=aspect views;class=;partition=4;description=OE0={FA67183F-38CC-4aa6-945B-60FA54013A48}:OE1={F889D07C-8647-44f2-9C6E-449B3E20BCF2}:OE2={A3FE9B4C-382E-40dc-958E-D9BF99277B20}:OE3={BF31E977-E54E-4706-9C28-3C22B15A8113}:OE4={68D5E5EA-FC7A-4339-81EA-0B04F7E45A43}:OE5={D328B002-DFC9-487f-A930-EAEFF23E8568}:OE6={C51CEE38-0715-4c7f-A11A-33482161EFBA}:OE7={0E2769F1-F27B-445a-A3EA-854B47E10131}:OE8={DE4D587C-087C-40fa-B63D-56DEA2854500}:OE9={4C442DBD-D8E5-4d12-A2A1-A7DEA1E5A1B0}:OE10={0B563D27-1575-48a5-8CFF-5424B393E918}:OE11={954E4827-D178-4ebc-9EE2-A6F61F870DB6}:OE12={DF46765F-128C-4cd8-8E8A-A6EC221BAB4F}:OE13={2F3555E6-B9A6-4208-9A19-747532DBC93F}:OE14={03490E2B-19F2-47c3-BE70-0ED3FC280AF1}:OE15={24F90E61-753D-4cf6-8358-F904A686244F}:OE16={03EE3ECF-9EFF-4bf9-A068-667A0CDFBA55}:OE17={B4D0C52E-CCFA-47ce-BC07-A09D9044B69E}:OE18={9AC5B7BC-A46F-4781-BEC6-8F4C43A57375}:OE19={BD29EEFB-4E03-4cf6-AD73-9F36D358A79D}:OE20={68CBB1C3-32CC-4a39-9E09-7F4B0B14BD18}:OE21={B4C14031-6888-4fe3-A7BA-FCC3A6DFD2D4}:OE22={307A886F-B089-4e24-95CC-EC9CC2A318DC}:OE23={414DE231-616E-4297-80E4-BD39186A377C}:OE24={5801346B-ABFD-43de-848A-9E57F39B74ED}:OE25={DE101954-6101-4316-8883-58912E14D385}:OE26={34185A69-499F-47f1-8C0E-32D2FDF93E0A}:;"/>
+					<element geometry="width=200;" subject="EAID_374A9D3C_9024_477e_A93F_9CC4739744E9" style="swimlane;name=phase views;class=;partition=2;description=OE0={F990707E-C758-4479-B2F5-BD41CC5DDBC9}:OE1={D6C95713-EB11-4af7-8A46-9B20895C7AD2}:OE2={D964D718-09AD-453d-9261-B680435DC8F5}:OE3={155C7FA7-6962-4810-AED6-D94302F09660}:OE4={24A53112-91DE-40c0-B978-81AE2B81BF17}:;"/>
+					<element geometry="width=200;" subject="EAID_29E82798_63AE_4faf_A952_6C6A0933DE3B" style="swimlane;name=monetary values;class=;partition=3;description=OE0={EED92360-39E2-48e3-93F3-A9FAE5CE18B1}:OE1={C0FA4596-11C5-4b97-AB06-08AA082CD52B}:OE2={46C02EA3-5EA6-48ea-9F81-DB71EAB73C34}:;"/>
+					<element geometry="width=1218;" subject="EAID_9D12E2D2_3867_476f_ABB0_B0C6B362D4C5" style="swimlane;name=aspect views;class=;partition=4;description=OE0={FA67183F-38CC-4aa6-945B-60FA54013A48}:OE1={F889D07C-8647-44f2-9C6E-449B3E20BCF2}:OE2={A3FE9B4C-382E-40dc-958E-D9BF99277B20}:OE3={BF31E977-E54E-4706-9C28-3C22B15A8113}:OE4={68D5E5EA-FC7A-4339-81EA-0B04F7E45A43}:OE5={DE4D587C-087C-40fa-B63D-56DEA2854500}:OE6={4C442DBD-D8E5-4d12-A2A1-A7DEA1E5A1B0}:OE7={0B563D27-1575-48a5-8CFF-5424B393E918}:OE8={954E4827-D178-4ebc-9EE2-A6F61F870DB6}:OE9={DF46765F-128C-4cd8-8E8A-A6EC221BAB4F}:OE10={2F3555E6-B9A6-4208-9A19-747532DBC93F}:OE11={03490E2B-19F2-47c3-BE70-0ED3FC280AF1}:OE12={24F90E61-753D-4cf6-8358-F904A686244F}:OE13={03EE3ECF-9EFF-4bf9-A068-667A0CDFBA55}:OE14={B4D0C52E-CCFA-47ce-BC07-A09D9044B69E}:OE15={9AC5B7BC-A46F-4781-BEC6-8F4C43A57375}:OE16={BD29EEFB-4E03-4cf6-AD73-9F36D358A79D}:OE17={68CBB1C3-32CC-4a39-9E09-7F4B0B14BD18}:OE18={B4C14031-6888-4fe3-A7BA-FCC3A6DFD2D4}:OE19={307A886F-B089-4e24-95CC-EC9CC2A318DC}:OE20={414DE231-616E-4297-80E4-BD39186A377C}:OE21={5801346B-ABFD-43de-848A-9E57F39B74ED}:OE22={DE101954-6101-4316-8883-58912E14D385}:OE23={34185A69-499F-47f1-8C0E-32D2FDF93E0A}:;"/>
 				</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-06-20 11:18:51"/>
+				<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=979395FB;"/>
+				<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=408;Top=23;Right=640;Bottom=160;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="1" 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="2" style="NSL=0;DUID=27A937A9;"/>
-					<element geometry="Left=0;Top=320;Right=282;Bottom=405;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" 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=E84E1D99;"/>
-					<element geometry="Left=1347;Top=76;Right=1620;Bottom=148;" 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=4581E1F3;"/>
-					<element geometry="Left=449;Top=733;Right=736;Bottom=922;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" 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=D93AF40A;"/>
-					<element geometry="Left=907;Top=603;Right=1068;Bottom=662;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="6" 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="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=4B459512;"/>
-					<element geometry="Left=2086;Top=532;Right=2260;Bottom=602;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="8" style="NSL=0;DUID=82E4D1AC;"/>
-					<element geometry="Left=850;Top=415;Right=1069;Bottom=500;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="9" 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=1682;Top=409;Right=1898;Bottom=507;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=CD853710;"/>
-					<element geometry="Left=1257;Top=526;Right=1435;Bottom=585;" subject="EAID_58CE0F8A_1B9B_418e_B4D4_D8AE4F96B00B" 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=84B0B29A;"/>
-					<element geometry="Left=1257;Top=285;Right=1530;Bottom=349;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" 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=C3404CFA;"/>
-					<element geometry="Left=2105;Top=428;Right=2403;Bottom=487;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="13" 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="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=6D3EFD14;"/>
-					<element geometry="Left=494;Top=603;Right=655;Bottom=662;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" 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=9078C52C;"/>
-					<element geometry="SX=-6;SY=6;EX=-6;EY=-24;EDGE=4;$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=;" subject="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=9078C52C;SOID=638C7CF6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<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=55;SY=0;EX=0;EY=-7;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=196:-98$;" 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=0;EX=6;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89: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_44CFA3B0_EE66_4ace_9069_38D7A3B7A01C" style="Mode=3;EOID=9078C52C;SOID=D93AF40A;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=47;SY=0;EX=94;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=98: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=2301:-358$625:-358$;" 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=11;SY=-1;EX=37;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=0;SY=-9;EX=44;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=43: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=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=575:-326$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=6D3EFD14;SOID=C3404CFA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-63;SY=0;EX=0;EY=-31;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=1283:-488$;" 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=1785:-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=-45;SY=19;EX=2;EY=38;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=23:OY=24:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=-23: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=1;EX=0;EY=-11;$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=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=;"/>
-					<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={952A6222-7ED2-4ca4-A084-E51BAA1CF00D}:OE4={8D49E47D-4538-44e7-BAA8-68D1BF528FF5}:;"/>
+					<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}:;"/>
-					<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}:OE1={F3FB4F33-4944-4d1a-AAE8-D204E1D2E460}:;"/>
+					<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_8187914A_C8B4_4cd2_BE0C_83AFEE8CC0B5">
-				<model package="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" localID="306" owner="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" tpos="2"/>
-				<properties name="monetary value - competition" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-03-17 11:23:16" modified="2023-06-20 11:20: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=66B89BC1;"/>
-				<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=770;Top=58;Right=941;Bottom=128;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="1" style="DUID=7DE30591;NSL=0;BCol=-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=25;Right=616;Bottom=162;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="2" style="DUID=E84A7DDE;NSL=0;BCol=-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=225;Right=639;Bottom=331;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="3" style="DUID=C32A94C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=369;Top=376;Right=630;Bottom=474;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="4" style="DUID=47A9F9CC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=70;Top=251;Right=182;Bottom=306;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="5" style="DUID=1645280E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=714;Top=229;Right=981;Bottom=329;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="6" style="DUID=896244AD;NSL=0;"/>
-					<element geometry="Left=758;Top=402;Right=936;Bottom=448;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" seqno="7" style="DUID=97FD089E;NSL=0;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=CX=80:CY=14:OX=37: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_EBC0DED2_0415_4ef8_A495_71F8920238AD" style="Mode=3;EOID=896244AD;SOID=97FD089E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=1;SY=2;EX=1;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=-2:OY=-10:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-19:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E" style="Mode=3;EOID=97FD089E;SOID=47A9F9CC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-1;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=125:-94$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=E84A7DDE;SOID=1645280E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=1645280E;SOID=C32A94C0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-3;SY=0;EX=-3;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=E84A7DDE;SOID=C32A94C0;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=0;SY=6;EX=1;EY=0;$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=896244AD;SOID=7DE30591;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=7DE30591;SOID=E84A7DDE;Color=-1;LWidth=0;Hidden=0;"/>
-				</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 - submission" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-03-17 12:20:39" modified="2023-06-27 11:40:23"/>
+				<properties name="monetary value - competition" type="Logical"/>
+				<project author="andreea" version="1.0" created="2022-03-17 12:20:39" modified="2023-09-11 13:54:06"/>
 				<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=ECD49CE5;"/>
+				<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=ACC26046;"/>
 				<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=28;Top=368;Right=118;Bottom=428;" subject="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" seqno="1" 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=161;Top=54;Right=393;Bottom=191;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="2" 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=747;Bottom=723;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="3" style="DUID=2FE36D05;NSL=0;"/>
-					<element geometry="Left=180;Top=210;Right=399;Bottom=293;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=7A72742F;"/>
-					<element geometry="Left=508;Top=210;Right=728;Bottom=315;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="5" style="DUID=071A8B71;"/>
-					<element geometry="Left=179;Top=401;Right=399;Bottom=486;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="6" style="DUID=C66B8DCA;NSL=0;"/>
-					<element geometry="Left=921;Top=210;Right=1229;Bottom=456;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="7" style="NSL=0;DUID=01BFF175;"/>
-					<element geometry="SX=0;SY=-1;EX=-2;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=616:-123$;" subject="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" style="Mode=3;EOID=071A8B71;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="SX=0;SY=-27;EX=43;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155:CY=14:OX=85: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=1118:-616$;" 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=17;EX=-106;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=83: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=969:-572$;" 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=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="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=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="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;Hidden=0;"/>
-					<element geometry="SX=0;SY=-37;EX=-2;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=57: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=71:-288$;" subject="EAID_19D655E2_E290_486c_A489_DFE2AC9F7B9B" style="Mode=3;EOID=F6AFA4D5;SOID=7A72742F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=1293;Top=34;Right=1403;Bottom=104;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" 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=64D1F3B0;"/>
+					<element geometry="Left=480;Top=889;Right=758;Bottom=995;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=64C23572;"/>
+					<element geometry="Left=1088;Top=820;Right=1200;Bottom=875;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" 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=FFC9F4E0;"/>
+					<element geometry="Left=1297;Top=211;Right=1558;Bottom=335;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" 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=54913BF5;"/>
+					<element geometry="Left=1058;Top=689;Right=1229;Bottom=759;" 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=4CADD5DD;"/>
+					<element geometry="Left=1058;Top=34;Right=1229;Bottom=104;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" 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=C44AADC4;"/>
+					<element geometry="Left=1338;Top=401;Right=1516;Bottom=447;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" 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=2C5289FA;"/>
+					<element geometry="Left=99;Top=341;Right=189;Bottom=401;" subject="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" seqno="8" 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="9" 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=747;Bottom=723;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="10" style="DUID=2FE36D05;NSL=0;"/>
+					<element geometry="Left=180;Top=210;Right=399;Bottom=293;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=7A72742F;"/>
+					<element geometry="Left=508;Top=210;Right=728;Bottom=315;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="12" style="DUID=071A8B71;"/>
+					<element geometry="Left=245;Top=401;Right=465;Bottom=486;" subject="EAID_4A0A67E0_4C05_480c_B152_611B940C8A5E" seqno="13" style="DUID=C66B8DCA;NSL=0;"/>
+					<element geometry="Left=921;Top=210;Right=1229;Bottom=456;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="14" 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=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:-737$;" 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="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="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=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=77: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_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=FFC9F4E0;SOID=4CADD5DD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=1;SY=2;EX=1;EY=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=47:OY=-28: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_B851F167_3C73_4e45_9F54_76A56333BE1E" style="Mode=3;EOID=2C5289FA;SOID=54913BF5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-16;EX=-79;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=93:-863$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=82003F67;SOID=FFC9F4E0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-4;EX=-108;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=64:-946$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=82003F67;SOID=64C23572;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=-5;EX=5;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=83: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=1149:-947$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=FFC9F4E0;SOID=64C23572;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=22;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135:CY=14:OX=69: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=1347:-16$194:-16$;" subject="EAID_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=82003F67;SOID=64D1F3B0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<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;"/>
 				</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="2023-07-17 16:41:49"/>
+				<project author="andreea" version="1.0" created="2022-03-17 18:18:50" modified="2023-09-11 13:55:00"/>
 				<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=EED04DC8;"/>
+				<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=45338819;"/>
 				<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=368;Top=456;Right=471;Bottom=526;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="1" 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=346;Top=606;Right=480;Bottom=676;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="2" 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="3" 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=502;Top=376;Right=621;Bottom=419;" subject="EAID_C451EC7C_9778_40f3_B90C_6DEFC3C6D8BB" seqno="4" style="DUID=D009B4B3;"/>
-					<element geometry="Left=130;Top=194;Right=288;Bottom=240;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="5" style="NSL=0;DUID=34F9229E;"/>
-					<element geometry="Left=1339;Top=665;Right=1563;Bottom=737;" 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=CDF60883;"/>
-					<element geometry="Left=1019;Top=652;Right=1238;Bottom=750;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="7" 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="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=40682DAF;"/>
-					<element geometry="Left=739;Top=677;Right=884;Bottom=726;" 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=42AD69D9;"/>
-					<element geometry="Left=130;Top=330;Right=288;Bottom=376;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="10" 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="11" style="NSL=0;DUID=9CF1A160;"/>
-					<element geometry="Left=87;Top=54;Right=313;Bottom=181;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="12" style="NSL=0;DUID=E6CAA722;"/>
-					<element geometry="SX=3;SY=59;EX=3;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=48:OY=-18: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=42AD69D9;SOID=40682DAF;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=1365;Top=456;Right=1536;Bottom=526;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="1" style="DUID=D3750C89;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=368;Top=456;Right=471;Bottom=526;" subject="EAID_E7437025_771F_4143_BE33_620A29646687" seqno="2" 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="3" 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="4" 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="5" style="DUID=D009B4B3;"/>
+					<element geometry="Left=130;Top=194;Right=288;Bottom=240;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="6" style="NSL=0;DUID=34F9229E;"/>
+					<element geometry="Left=1339;Top=616;Right=1563;Bottom=688;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=CDF60883;"/>
+					<element geometry="Left=1019;Top=603;Right=1238;Bottom=701;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="8" 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="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=40682DAF;"/>
+					<element geometry="Left=739;Top=628;Right=884;Bottom=677;" 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=42AD69D9;"/>
+					<element geometry="Left=124;Top=330;Right=295;Bottom=392;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="11" 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="12" style="NSL=0;DUID=9CF1A160;"/>
+					<element geometry="Left=87;Top=54;Right=313;Bottom=181;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="13" style="NSL=0;DUID=E6CAA722;"/>
+					<element geometry="SX=80;SY=-11;EX=80;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=113:OY=75:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=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=9CF1A160;SOID=40682DAF;Color=-1;LWidth=0;TREE=OR;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;"/>
@@ -45642,55 +47902,60 @@
 					<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;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=-67;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1451:-228$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=9CF1A160;SOID=CDF60883;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=3;SY=-18;EX=-2;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=204:CY=14:OX=-40: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_949017B7_0159_4fe1_8469_562A93DEF12E" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=112;SY=-50;EX=0;EY=-6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=206:CY=14:OX=-38: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_510F8DDB_DB12_48df_92AE_A27F7DFCCAC3" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-6;SY=1;EX=-6;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=B15588FF;SOID=512EC1B6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=-67;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1451:-228$;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=9CF1A160;SOID=CDF60883;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<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="EDGE=2;SX=0;SY=-36;EX=0;EY=-15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1105:-527$1105:-174$;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" style="Mode=3;EOID=9CF1A160;SOID=40682DAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=122;SY=-7;EX=122;EY=-7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192:CY=14:OX=106: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_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=9CF1A160;SOID=40682DAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=9;SY=-5;EX=9;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=113:OY=75:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=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=9CF1A160;SOID=40682DAF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-104;SY=-9;EX=-104;EY=-9;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="EDGE=1;SX=1;SY=3;EX=2;EY=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=B15588FF;SOID=512EC1B6;Color=-1;LWidth=0;Hidden=0;"/>
+					<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=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=29;SY=0;EX=0;EY=26;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=1157:-133$;" 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=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="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="SX=3;SY=-18;EX=-2;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=204:CY=14:OX=-40: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_949017B7_0159_4fe1_8469_562A93DEF12E" style="Mode=3;EOID=9CF1A160;SOID=E6CAA722;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=3;SY=59;EX=3;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=14:OX=48:OY=-18: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=42AD69D9;SOID=40682DAF;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_A2669D8B_ED55_4aef_B387_F43B34E94682">
 				<model package="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" localID="313" owner="EAPK_B734BB7B_9769_4212_99E0_41BB15EB13D0" tpos="5"/>
 				<properties name="monetary value - completion" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-03-25 10:39:03" modified="2023-06-28 11:11:29"/>
+				<project author="lps" version="1.0" created="2022-03-25 10:39:03" modified="2023-08-29 16:05:04"/>
 				<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=03583CDB;"/>
+				<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=006A5CA2;"/>
 				<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=84;Top=678;Right=322;Bottom=779;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="1" style="DUID=6786590E;NSL=0;"/>
-					<element geometry="Left=102;Top=530;Right=305;Bottom=606;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="2" style="NSL=0;DUID=28574949;"/>
-					<element geometry="Left=92;Top=349;Right=316;Bottom=421;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="3" style="DUID=4EA46E11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=398;Top=217;Right=617;Bottom=328;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="4" style="DUID=F1D9973F;NSL=0;BCol=-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=374;Right=770;Bottom=472;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="5" style="DUID=C67A1D3D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=832;Top=237;Right=1126;Bottom=307;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="6" style="DUID=DC78118D;"/>
-					<element geometry="Left=80;Top=76;Right=329;Bottom=204;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="7" style="DUID=5ED2297D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=507;Top=675;Right=774;Bottom=781;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="8" style="DUID=7900B829;NSL=0;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=103;SY=0;EX=0;EY=-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=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=744:-142$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=5ED2297D;SOID=C67A1D3D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-85;SY=0;EX=0;EY=-44;$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=422:-184$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=5ED2297D;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=-6;EX=59;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=53:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;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=263:-278$;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=4EA46E11;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=273;Top=932;Right=447;Bottom=1002;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="1" style="DUID=453F2819;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=241;Top=745;Right=479;Bottom=846;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="2" style="DUID=6786590E;NSL=0;"/>
+					<element geometry="Left=4;Top=745;Right=207;Bottom=821;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="3" style="NSL=0;DUID=28574949;"/>
+					<element geometry="Left=249;Top=416;Right=473;Bottom=488;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" seqno="4" style="DUID=4EA46E11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=555;Top=284;Right=774;Bottom=395;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="5" style="DUID=F1D9973F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=669;Top=441;Right=927;Bottom=539;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="6" style="DUID=C67A1D3D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=989;Top=304;Right=1283;Bottom=374;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" seqno="7" style="DUID=DC78118D;"/>
+					<element geometry="Left=237;Top=143;Right=486;Bottom=271;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="8" style="DUID=5ED2297D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=664;Top=742;Right=931;Bottom=848;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="9" style="DUID=7900B829;NSL=0;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=103;SY=0;EX=0;EY=-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=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=901:-209$;" subject="EAID_96BA801A_E8C8_4628_94BC_1C90816E0487" style="Mode=3;EOID=5ED2297D;SOID=C67A1D3D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-85;SY=0;EX=0;EY=-44;$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=579:-251$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=5ED2297D;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-6;EX=59;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=53:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;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=420:-345$;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=4EA46E11;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-71;SY=1;EX=0;EY=0;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=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=F1D9973F;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-28;SY=0;EX=0;EY=38;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=6: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=951:-102$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=5ED2297D;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-10;SY=0;EX=0;EY=11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=170: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=969:-717$;" subject="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=7900B829;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=24;SY=0;EX=0;EY=-31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1003:-759$;" subject="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=7900B829;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=32;SX=-96;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=411:-696$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=7900B829;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-28;SY=0;EX=0;EY=38;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=6: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=1108:-169$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=5ED2297D;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-10;SY=0;EX=0;EY=11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=170: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=1126:-784$;" subject="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=7900B829;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=24;SY=0;EX=0;EY=-31;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1160:-826$;" subject="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=7900B829;SOID=DC78118D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=32;SX=-96;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=568:-763$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=7900B829;SOID=F1D9973F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=55: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_4FB4981B_F0BC_4d9f_9B16_DD484C6E2547" style="Mode=3;EOID=5ED2297D;SOID=4EA46E11;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=219;SCTR.TOP=-552;SCTR.RIGHT=318;SCTR.BOTTOM=-497;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=116:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=305:-552$318:-552$318:-497$219:-497$219:-530$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=28574949;SOID=28574949;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-104;SY=5;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=125:OY=-144:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;LRB=CX=17:CY=14:OX=-4:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" style="Mode=3;EOID=7900B829;SOID=C67A1D3D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=109;SY=-4;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192:CY=14:OX=179:OY=-185:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;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_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=7900B829;SOID=C67A1D3D;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=121;SCTR.TOP=-767;SCTR.RIGHT=220;SCTR.BOTTOM=-712;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=116:OY=-31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=207:-767$220:-767$220:-712$121:-712$121:-745$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=28574949;SOID=28574949;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-30;SY=-3;EX=-29;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=181:OY=-181: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_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=7900B829;SOID=C67A1D3D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=47;SY=-4;EX=48;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=186:OY=-186: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_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=7900B829;SOID=C67A1D3D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-3;SY=2;EX=-3;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=28574949;SOID=6786590E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=2;EX=-6;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=99:-965$;" subject="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" style="Mode=3;EOID=28574949;SOID=453F2819;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118: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_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=6786590E;SOID=453F2819;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=-2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=48: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=795:-967$;" subject="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" style="Mode=3;EOID=7900B829;SOID=453F2819;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=2;EX=-3;EY=1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=28574949;SOID=6786590E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-1;SY=-15;EX=-66;EY=-24;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114: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_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" style="Mode=3;EOID=7900B829;SOID=6786590E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=39;SY=1;EX=39;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=7900B829;SOID=4EA46E11;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
@@ -45698,216 +47963,215 @@
 			<diagram xmi:id="EAID_605C4B64_024F_408a_995E_857FCDBE5F93">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="338" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="1"/>
 				<properties name="planning" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-05-13 14:40:09" modified="2023-07-14 17:43:34"/>
+				<project author="lps" version="1.0" created="2022-05-13 14:40:09" modified="2023-09-11 13:57: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=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=C1C70C32;"/>
+				<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=7308AAF5;"/>
 				<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=87;Top=456;Right=202;Bottom=523;" subject="EAID_45C4E15B_DDF5_4be9_BA2A_4BE70960E4FB" seqno="1" style="DUID=7B63A909;"/>
-					<element geometry="Left=872;Top=175;Right=1043;Bottom=245;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="2" style="DUID=B4697EAE;NSL=0;BCol=-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=272;Right=1073;Bottom=409;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="3" style="DUID=190B37E5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=117;Top=29;Right=207;Bottom=89;" subject="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" seqno="4" style="DUID=494EE68E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=79;Top=196;Right=245;Bottom=245;" subject="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" seqno="5" style="DUID=4381CED4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=79;Top=131;Right=245;Bottom=180;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="6" style="DUID=780169F9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=554;Top=37;Right=644;Bottom=97;" subject="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" seqno="7" style="DUID=F91AF99B;NSL=0;BCol=-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=142;Right=689;Bottom=200;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="8" style="DUID=6589DC0F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=380;Top=142;Right=484;Bottom=219;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="9" style="DUID=40306B25;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=407;Top=298;Right=689;Bottom=383;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="10" style="DUID=60A2BCDB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=83;Top=323;Right=206;Bottom=383;" subject="EAID_B2AE8177_7A7C_4d15_A935_11584ADDCE8B" seqno="11" style="DUID=CCBCA54B;NSL=0;BCol=-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=654;Right=1025;Bottom=711;" subject="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" 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=86668FCA;"/>
-					<element geometry="Left=813;Top=467;Right=1100;Bottom=588;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="13" style="DUID=615A5729;NSL=0;BCol=-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=445;Right=678;Bottom=556;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="14" style="DUID=361559BE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1278;Top=497;Right=1460;Bottom=559;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="15" style="DUID=FB339DB5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1175;Top=160;Right=1442;Bottom=259;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" 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=B2C341C4;"/>
-					<element geometry="EX=14;EY=32;SX=-118;SY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=55:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17: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=;" subject="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463" style="Mode=3;EOID=40306B25;SOID=60A2BCDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=872;Top=175;Right=1043;Bottom=245;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="1" style="DUID=B4697EAE;NSL=0;BCol=-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=272;Right=1073;Bottom=409;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="2" style="DUID=190B37E5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=117;Top=29;Right=207;Bottom=89;" subject="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" seqno="3" style="DUID=494EE68E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=79;Top=196;Right=245;Bottom=245;" subject="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" seqno="4" style="DUID=4381CED4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=79;Top=131;Right=245;Bottom=180;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="5" style="DUID=780169F9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=554;Top=37;Right=644;Bottom=97;" subject="EAID_5A01D361_6509_447f_B318_F20F23FBF81F" seqno="6" style="DUID=F91AF99B;NSL=0;BCol=-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=142;Right=689;Bottom=200;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="7" style="DUID=6589DC0F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=380;Top=142;Right=484;Bottom=219;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="8" style="DUID=40306B25;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=407;Top=298;Right=689;Bottom=383;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="9" style="DUID=60A2BCDB;NSL=0;BCol=-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=654;Right=1025;Bottom=711;" subject="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" 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=86668FCA;"/>
+					<element geometry="Left=813;Top=467;Right=1100;Bottom=588;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="11" style="DUID=615A5729;NSL=0;BCol=-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=445;Right=678;Bottom=556;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="12" style="DUID=361559BE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1278;Top=497;Right=1460;Bottom=559;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="13" style="DUID=FB339DB5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1175;Top=160;Right=1442;Bottom=259;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" 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=B2C341C4;"/>
+					<element geometry="SX=-15;SY=-9;EX=-15;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95: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=;" subject="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB" style="Mode=3;EOID=6589DC0F;SOID=60A2BCDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=B4697EAE;SOID=190B37E5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=2;SY=1;EX=15;EY=-13;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101:CY=14:OX=-22: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_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" style="Mode=3;EOID=B2C341C4;SOID=B4697EAE;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_A663CF6F_0B0E_47fa_B841_73C5D3CD3B56" style="Mode=3;EOID=60A2BCDB;SOID=7B63A909;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=44: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_007A256B_E0B5_4a62_B8D7_2BC14F331BE5" style="Mode=3;EOID=F91AF99B;SOID=6589DC0F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=62:CY=14:OX=26: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_90566F74_64BC_49c8_8076_1ECB982268EE" style="Mode=3;EOID=494EE68E;SOID=780169F9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=16;SX=0;SY=-13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" style="Mode=3;EOID=40306B25;SOID=780169F9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-2;EX=-35;EY=-29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=40306B25;SOID=4381CED4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=B4697EAE;SOID=190B37E5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-15;SY=-9;EX=-15;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95: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=;" subject="EAID_D77EAC2F_A434_424a_8ECC_D32EF06886BB" style="Mode=3;EOID=6589DC0F;SOID=60A2BCDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=-2;EX=2;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" style="Mode=3;EOID=60A2BCDB;SOID=CCBCA54B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=9;EX=7;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=112: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=1315:-331$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=B2C341C4;SOID=190B37E5;Color=-1;LWidth=0;TREE=OR;Hidden=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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=190B37E5;SOID=60A2BCDB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-1;SY=9;EX=-1;EY=9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=56: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_E425948E_6ABD_4c9b_83A7_6E582F53DA90" style="Mode=3;EOID=60A2BCDB;SOID=361559BE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=14;EY=32;SX=-118;SY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=104:CY=14:OX=55:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17: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=;" subject="EAID_EB2AC560_378D_4c18_9647_0E2E150D7463" style="Mode=3;EOID=40306B25;SOID=60A2BCDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=104;SY=0;EX=0;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=652:-215$;" subject="EAID_71953D29_84AD_4774_9664_258E887283AF" style="Mode=3;EOID=B4697EAE;SOID=60A2BCDB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-2;SY=0;EX=0;EY=-37;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1367:-377$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=190B37E5;SOID=FB339DB5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=190B37E5;SOID=615A5729;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=0;SY=1;EX=0;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=48:OY=-18: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=86668FCA;SOID=615A5729;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=1;EX=0;EY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=-2: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=FB339DB5;SOID=615A5729;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-1;SY=9;EX=-1;EY=9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=56: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_E425948E_6ABD_4c9b_83A7_6E582F53DA90" style="Mode=3;EOID=60A2BCDB;SOID=361559BE;Color=-1;LWidth=0;TREE=OR;Hidden=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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=190B37E5;SOID=60A2BCDB;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=-35;EY=-29;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=40306B25;SOID=4381CED4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<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="2023-07-14 17:51:23"/>
+				<project author="andreea" version="1.0" created="2022-05-16 11:37:28" modified="2023-09-11 14:05: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=1C8CC3FA;"/>
+				<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=A7AA8981;"/>
 				<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=2093;Top=1021;Right=2293;Bottom=1091;" subject="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" seqno="1" style="DUID=4B7F9A88;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2093;Top=1151;Right=2293;Bottom=1221;" subject="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" seqno="1" style="DUID=4B7F9A88;NSL=0;BCol=-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=772;Right=1325;Bottom=909;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="2" style="DUID=B575EB03;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1480;Top=596;Right=1651;Bottom=645;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="3" style="DUID=4B477F82;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=2170;Top=363;Right=2260;Bottom=423;" subject="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" seqno="4" style="DUID=54F3A151;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=343;Top=1224;Right=634;Bottom=1294;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="5" style="DUID=D85B3A8F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=343;Top=1307;Right=634;Bottom=1377;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="5" style="DUID=D85B3A8F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=2524;Top=426;Right=2697;Bottom=496;" subject="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" seqno="6" style="DUID=7E836D99;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=2502;Top=588;Right=2719;Bottom=712;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" 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=6B779533;"/>
 					<element geometry="Left=2285;Top=590;Right=2375;Bottom=650;" subject="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" seqno="8" style="DUID=A8BD16CA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1990;Top=1314;Right=2080;Bottom=1374;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" 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=3AF03FEB;"/>
-					<element geometry="Left=2355;Top=1348;Right=2445;Bottom=1408;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" 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=FD35F253;"/>
-					<element geometry="Left=2678;Top=1336;Right=2768;Bottom=1396;" subject="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" seqno="11" style="DUID=1B208C1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=794;Top=1403;Right=884;Bottom=1473;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" seqno="12" style="DUID=04DCE457;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1729;Top=1296;Right=1743;Bottom=1310;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="13" style="DUID=5F256B8F;"/>
-					<element geometry="Left=1254;Top=1381;Right=1482;Bottom=1472;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="14" style="DUID=1CEB784C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=868;Top=1168;Right=1155;Bottom=1347;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" seqno="15" style="DUID=A45BADAF;NSL=0;BCol=-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=1012;Right=1864;Bottom=1175;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="16" style="DUID=B17A3BF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1990;Top=1406;Right=2080;Bottom=1466;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" 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=3AF03FEB;"/>
+					<element geometry="Left=2355;Top=1440;Right=2445;Bottom=1500;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" 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=FD35F253;"/>
+					<element geometry="Left=2678;Top=1428;Right=2768;Bottom=1488;" subject="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" seqno="11" style="DUID=1B208C1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=794;Top=1512;Right=884;Bottom=1582;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" seqno="12" style="DUID=04DCE457;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1729;Top=1379;Right=1743;Bottom=1393;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="13" style="DUID=5F256B8F;"/>
+					<element geometry="Left=1254;Top=1490;Right=1482;Bottom=1581;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="14" style="DUID=1CEB784C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=868;Top=1251;Right=1155;Bottom=1430;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" seqno="15" style="DUID=A45BADAF;NSL=0;BCol=-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=1095;Right=1864;Bottom=1258;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="16" style="DUID=B17A3BF6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1154;Top=431;Right=1377;Bottom=501;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="17" style="DUID=EA7F007D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1628;Top=1409;Right=1642;Bottom=1423;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="18" style="DUID=CF6DA6FE;"/>
-					<element geometry="Left=2530;Top=1336;Right=2620;Bottom=1396;" subject="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" seqno="19" style="DUID=4FC6BF7B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=962;Top=1405;Right=1088;Bottom=1471;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" 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=0749C1EC;"/>
+					<element geometry="Left=1628;Top=1518;Right=1642;Bottom=1532;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="18" style="DUID=CF6DA6FE;"/>
+					<element geometry="Left=2530;Top=1428;Right=2620;Bottom=1488;" subject="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" seqno="19" style="DUID=4FC6BF7B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=962;Top=1514;Right=1088;Bottom=1580;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" 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=0749C1EC;"/>
 					<element geometry="Left=1720;Top=286;Right=2043;Bottom=501;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="21" style="DUID=B424C8ED;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1393;Top=402;Right=1696;Bottom=529;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" seqno="22" style="DUID=CC37279F;NSL=0;BCol=-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=751;Right=914;Bottom=984;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="23" style="DUID=03D5539A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1816;Top=558;Right=2127;Bottom=682;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="24" style="DUID=C510196B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2553;Top=1689;Right=2750;Bottom=1816;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" 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=33490495;"/>
+					<element geometry="Left=2553;Top=1807;Right=2750;Bottom=1934;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" 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=33490495;"/>
 					<element geometry="Left=1596;Top=768;Right=1844;Bottom=897;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="26" style="DUID=C5C7EE57;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2093;Top=1474;Right=2295;Bottom=1627;" 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=2469;Top=1021;Right=2640;Bottom=1091;" 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=1027;Right=1241;Bottom=1123;" 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=1989;Top=797;Right=2079;Bottom=867;" 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=283;Top=1423;Right=694;Bottom=1524;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="31" style="NSL=0;DUID=29138D4B;"/>
+					<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=2469;Top=1151;Right=2640;Bottom=1221;" 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=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=1168;Right=1532;Bottom=1238;" 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=1469;Right=1990;Bottom=1632;" 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=1491;Right=2787;Bottom=1615;" 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=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=-63;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:-260$2803:-260$2803:-1855$2131:-1855$;" subject="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=0F0DA707;SOID=EA7F007D;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="SX=0;SY=54;EX=0;EY=-62;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1272:-1039$;" 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:-1357$1021:-1357$;" 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:-1416$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=1CEB784C;SOID=B17A3BF6;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="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=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=2;EY=-5;EDGE=3;$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:-1809$;" 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=;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=3;SX=3;SY=0;EX=0;EY=26;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=752:-1049$;" 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=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="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:-1438$;" subject="EAID_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=1CEB784C;SOID=B17A3BF6;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=23;SY=-4;EX=24;EY=-4;$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;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="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=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="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;"/>
 					<element geometry="SX=0;SY=35;EX=-3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=81: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=1562:-799$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=4B477F82;SOID=B575EB03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-108;SY=0;EX=0;EY=23;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1430:-666$;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=188945D1;SOID=CC37279F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=81;SY=-19;EX=81;EY=-19;$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=;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=29138D4B;SOID=D85B3A8F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-87;SY=0;EX=-87;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=245: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=;" subject="EAID_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=29138D4B;SOID=D85B3A8F;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=89;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=577:-1073$;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=2675274A;SOID=D85B3A8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=89;SY=0;EX=0;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=577:-1147$;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=2675274A;SOID=D85B3A8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=0;EY=29;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=492:-660$;" subject="EAID_F9E99464_DED7_437a_98F9_263E29761C37" style="Mode=3;EOID=188945D1;SOID=D85B3A8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-110;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=378:-623$;" subject="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" style="Mode=3;EOID=4B477F82;SOID=D85B3A8F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=9;EY=0;SX=0;SY=-11;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=41: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=2044:-1067$;" subject="EAID_06D187DF_9192_4549_BE01_736C22D89AEA" style="Mode=3;EOID=3AF03FEB;SOID=4B7F9A88;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<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:-1074$;" subject="EAID_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" style="Mode=3;EOID=FD35F253;SOID=4B7F9A88;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=9;EY=0;SX=0;SY=-11;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=41: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=2044:-1197$;" subject="EAID_06D187DF_9192_4549_BE01_736C22D89AEA" style="Mode=3;EOID=3AF03FEB;SOID=4B7F9A88;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<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=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=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:-1320$;" 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=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;"/>
-					<element geometry="EDGE=1;SX=22;SY=0;EX=0;EY=-19;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81: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=-3:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1907:-1363$;" subject="EAID_677B606B_352C_459b_9644_C85CAC550728" style="Mode=3;EOID=3AF03FEB;SOID=232C7D31;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-22;SY=-21;EX=-22;EY=-21;EDGE=1;$LLB=;LLT=;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=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250" style="Mode=3;EOID=4B7F9A88;SOID=232C7D31;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-5;SY=0;EX=0;EY=-35;EDGE=1;$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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1880:-1096$2028:-1096$2028:-1091$;" subject="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA" style="Mode=3;EOID=4B7F9A88;SOID=232C7D31;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=22;SY=0;EX=0;EY=-19;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81: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=-3:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1907:-1455$;" subject="EAID_677B606B_352C_459b_9644_C85CAC550728" style="Mode=3;EOID=3AF03FEB;SOID=232C7D31;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-22;SY=-21;EX=-22;EY=-21;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C2095B58_1DB2_4aad_836A_C0752B58E250" style="Mode=3;EOID=4B7F9A88;SOID=232C7D31;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-5;SY=0;EX=0;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1880:-1226$2028:-1226$2028:-1221$;" subject="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA" style="Mode=3;EOID=4B7F9A88;SOID=232C7D31;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EX=0;EY=30;SX=92;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=58: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_15FE118D_5443_4723_8887_BFF48DC77200" style="Mode=3;EOID=1B208C1B;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;SX=-119;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=60: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_D8B16DE0_0613_42f0_811D_F82085D6A825" style="Mode=3;EOID=4FC6BF7B;SOID=AC2143B9;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=2786;SCTR.TOP=-1670;SCTR.RIGHT=2824;SCTR.BOTTOM=-1619;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=119:OY=34:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=2787:-1670$2824:-1670$2824:-1619$2787:-1619$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=AC2143B9;SOID=AC2143B9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=28;SY=15;EX=14;EY=27;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49: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=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=0F0DA707;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=18;SY=7;EX=5;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=23: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_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=0F0DA707;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-2;SY=-55;EX=-92;EY=-8;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=69:OY=-34:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-5:OY=-19: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=33490495;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=122;SY=0;EX=0;EY=23;$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=2782:-1321$;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=3AF03FEB;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=25;EX=-1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49:CY=14:OX=36: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=2193:-1727$;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=0F0DA707;SOID=33490495;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=4;SY=9;EX=4;EY=2;$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;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:-1382$;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=FD35F253;SOID=0F0DA707;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=122;SY=0;EX=0;EY=23;$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=2782:-1413$;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=3AF03FEB;SOID=AC2143B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=25;EX=-1;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49:CY=14:OX=36: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=2193:-1845$;" subject="EAID_A4228FCF_2B3C_44e6_BD17_379180274988" style="Mode=3;EOID=0F0DA707;SOID=33490495;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="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;$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=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="SX=7;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=1436:-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=67;SY=0;EX=0;EY=-35;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:-1128$;" 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=-37;SY=0;EX=0;EY=-19;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1392:-1094$;" 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=-2;EX=-13;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=2021:-1259$;" 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=-22;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1005:-1097$;" 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:-1223$;" 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=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="SX=0;SY=5;EX=5;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=2615:-827$;" 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="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="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="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="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="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="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;"/>
+					<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="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=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=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="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="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=-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:-1362$;" 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=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;"/>
 				</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="2023-07-14 17:53:42"/>
+				<project author="andreea" version="1.0" created="2022-05-16 13:24:02" modified="2023-09-11 14:06: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;"/>
-				<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=B3474841;"/>
+				<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=D70ACBC0;"/>
 				<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=915;Top=227;Right=1011;Bottom=297;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="1" style="DUID=147CB9E8;NSL=0;BCol=-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=620;Right=728;Bottom=887;" subject="EAID_AFB152CB_0A7E_42d6_8C56_63A3A737F49A" seqno="2" style="NSL=0;DUID=78916526;"/>
-					<element geometry="Left=192;Top=403;Right=353;Bottom=462;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" 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=5CB4AB22;"/>
+					<element geometry="Left=192;Top=403;Right=363;Bottom=462;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" 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=5CB4AB22;"/>
 					<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=1188;Top=227;Right=1284;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=1043;Top=157;Right=1133;Bottom=227;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="7" style="DUID=E664A72E;NSL=0;BCol=-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="8" style="NSL=0;DUID=2C0D97E7;"/>
-					<element geometry="Left=926;Top=636;Right=1122;Bottom=696;" 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=1047C5FC;"/>
-					<element geometry="Left=157;Top=823;Right=324;Bottom=908;" 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=08A7AD2B;"/>
-					<element geometry="Left=466;Top=475;Right=733;Bottom=566;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;DUID=6D996FC6;"/>
-					<element geometry="EDGE=3;SX=70;SY=0;EX=0;EY=-32;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160: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=13:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1439:-552$;" subject="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" style="Mode=3;EOID=6D996FC6;SOID=2C0D97E7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-13;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1223:-190$;" subject="EAID_A27A53B2_A6D1_4fdd_A43E_D33DC6607852" style="Mode=3;EOID=E664A72E;SOID=8B6C1D12;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=1;SX=-69;SY=0;EX=0;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=78: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=;" subject="EAID_E026EBD4_4329_4e57_9F78_AF7887C44E46" style="Mode=3;EOID=147CB9E8;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=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=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=824;Right=363;Bottom=908;" 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=-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=1082:-273$;" subject="EAID_24545C91_D269_4cfe_A646_9A2FDEE01B0F" style="Mode=3;EOID=8B6C1D12;SOID=0C3EFD81;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-3;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=960:-191$;" subject="EAID_199C3BDF_913A_42e4_A409_64CB2CE61248" style="Mode=3;EOID=E664A72E;SOID=147CB9E8;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=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=-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;"/>
+					<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=0;SY=-30;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=48: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=1024:-895$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=1047C5FC;SOID=08A7AD2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=0;EX=0;EY=42;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=70: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_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=08A7AD2B;SOID=5CB4AB22;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;"/>
+					<element geometry="SX=73;SY=0;EX=0;EY=-25;EDGE=1;$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=333:-545$;" subject="EAID_72A7614C_D179_4558_8F62_2FA41A99DF74" style="Mode=3;EOID=6D996FC6;SOID=08A7AD2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-30;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=48: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=1024:-896$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=1047C5FC;SOID=08A7AD2B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-33;SY=1;EX=-34;EY=42;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=14:OX=70: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_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=08A7AD2B;SOID=5CB4AB22;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=3;SY=18;EX=3;EY=5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=92:CY=14:OX=-18: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_688D5CB1_0ADB_4c2a_A8CB_6EBF4CDA67D5" style="Mode=3;EOID=0C3EFD81;SOID=5CB4AB22;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=2;EX=3;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=37: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=602:-430$;" subject="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" style="Mode=3;EOID=6D996FC6;SOID=5CB4AB22;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=2;EX=3;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81:CY=14:OX=37: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=602:-430$;" subject="EAID_7A92C123_93F7_4d51_A677_A1E36D3B53C0" style="Mode=3;EOID=6D996FC6;SOID=5CB4AB22;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-2;SY=7;EX=90;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=115: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_98D513D4_9622_4217_94D7_26E6E451AF0C" style="Mode=3;EOID=6D996FC6;SOID=78916526;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=51;EX=-64;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=176:-368$;" 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=70;SY=0;EX=0;EY=-32;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160: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=13:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1439:-552$;" subject="EAID_55AE269D_7874_4515_A52E_6EBA9F23871A" style="Mode=3;EOID=6D996FC6;SOID=2C0D97E7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<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="2023-07-14 18:00:33"/>
+				<project author="andreea" version="1.0" created="2022-05-16 14:40:16" modified="2023-09-11 15:57: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;"/>
-				<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=D9F47DB3;"/>
+				<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=75223995;"/>
 				<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=662;Top=629;Right=849;Bottom=664;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="1" style="DUID=2BFD77E8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=463;Top=468;Right=566;Bottom=574;" 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=202;Top=303;Right=362;Bottom=348;" subject="EAID_C1196B58_92C1_4d7b_80CC_7E68CBDEDED2" seqno="3" style="NSL=0;DUID=6D633F68;"/>
-					<element geometry="Left=367;Top=628;Right=640;Bottom=700;" 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=1151;Top=725;Right=1375;Bottom=812;" 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=1173;Top=526;Right=1351;Bottom=585;" 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=1260;Top=339;Right=1389;Bottom=387;" 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=762;Top=464;Right=1059;Bottom=526;" 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=815;Top=736;Right=962;Bottom=802;" 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=219;Top=496;Right=347;Bottom=546;" 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=675;Top=145;Right=1087;Bottom=364;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;DUID=2D796B8E;"/>
-					<element geometry="Left=170;Top=145;Right=396;Bottom=288;" subject="EAID_1E0CEE91_900A_4ab4_94AC_B4EC57A6B248" seqno="12" style="NSL=0;DUID=054B25E1;"/>
-					<element geometry="SX=17;SY=-1;EX=36;EY=-9;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="Left=640;Top=528;Right=827;Bottom=563;" subject="EAID_22455012_00DF_4dd8_AD48_245A5F11A4D5" seqno="1" style="DUID=2BFD77E8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=441;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=202;Right=340;Bottom=247;" 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=1151;Top=425;Right=1329;Bottom=484;" 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=44;Right=1065;Bottom=263;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="11" style="NSL=0;DUID=2D796B8E;"/>
+					<element geometry="Left=148;Top=44;Right=374;Bottom=187;" 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=11;SY=8;EX=-7;EY=-58;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=217:CY=14:OX=-26: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_01B7EE24_F987_4c92_B06C_0EA23C9FD1C7" 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;"/>
@@ -45916,147 +48180,159 @@
 					<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="EDGE=2;SX=0;SY=24;EX=0;EY=20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=26: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=1245:-469$1245:-234$;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" 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=-93;SY=-1;EX=-105;EY=0;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=-7;SY=0;EX=0;EY=-36;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=748:-557$;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=9FE1D609;SOID=2BFD77E8;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=1269:-321$;" 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=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=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:-220$;" 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="EDGE=3;SX=2;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=285:-769$;" 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=31;SY=0;EX=0;EY=1;$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="SX=65;SY=0;EDGE=1;EX=0;EY=-97;$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=347:-250$;" 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=-97;$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=347:-250$;" 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=10;SY=0;EX=0;EY=-97;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=524:-351$;" 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=10;SY=0;EX=0;EY=-108;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=502:-261$;" 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=5;SY=-27;EX=5;EY=18;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=-167;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=714:-475$;" 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=126;SY=5;EX=126;EY=5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192:CY=14:OX=115: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_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=2D796B8E;SOID=04A55CEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=46;EX=-167;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=692:-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=17;SY=-1;EX=36;EY=-9;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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C31DC6F6_AFC8_4f2d_A78D_1C226568295B">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="344" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="6"/>
 				<properties name="completion" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-05-16 15:10:08" modified="2023-07-14 18:10:58"/>
+				<project author="andreea" version="1.0" created="2022-05-16 15:10:08" modified="2023-09-11 16:01: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=08F299F3;"/>
+				<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=3A9E9CAF;"/>
 				<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=898;Top=132;Right=1013;Bottom=187;" subject="EAID_81C81B52_091E_44a3_B615_FA2A1785469E" seqno="1" style="DUID=8E3E9928;"/>
+					<element geometry="Left=742;Top=160;Right=857;Bottom=215;" subject="EAID_81C81B52_091E_44a3_B615_FA2A1785469E" seqno="1" style="DUID=8E3E9928;"/>
 					<element geometry="Left=1354;Top=523;Right=1592;Bottom=624;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="2" style="DUID=C0ADFCA5;NSL=0;"/>
-					<element geometry="Left=1224;Top=668;Right=1314;Bottom=728;" subject="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" seqno="3" style="DUID=CC6DC639;NSL=0;"/>
-					<element geometry="Left=752;Top=543;Right=842;Bottom=603;" subject="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" seqno="4" style="DUID=F7FA968D;NSL=0;"/>
-					<element geometry="Left=1226;Top=158;Right=1429;Bottom=269;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="5" style="NSL=0;DUID=E60386D6;"/>
-					<element geometry="Left=576;Top=268;Right=824;Bottom=338;" subject="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" seqno="6" style="DUID=69B63BAD;NSL=0;"/>
+					<element geometry="Left=1224;Top=657;Right=1314;Bottom=717;" subject="EAID_E95530AB_B746_4056_8805_0F3BB79051BE" seqno="3" style="DUID=CC6DC639;NSL=0;"/>
+					<element geometry="Left=807;Top=544;Right=897;Bottom=604;" subject="EAID_C1D5C542_388C_4d77_B0AA_8B1D0C8C20CA" seqno="4" style="DUID=F7FA968D;NSL=0;"/>
+					<element geometry="Left=1224;Top=239;Right=1427;Bottom=350;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="5" style="NSL=0;DUID=E60386D6;"/>
+					<element geometry="Left=676;Top=277;Right=924;Bottom=347;" subject="EAID_92AE6E92_3A20_4642_A531_93ABFC476500" seqno="6" style="DUID=69B63BAD;NSL=0;"/>
 					<element geometry="Left=1026;Top=539;Right=1200;Bottom=609;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="7" style="DUID=C09DCFDC;NSL=0;"/>
-					<element geometry="Left=2004;Top=374;Right=2302;Bottom=433;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" 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=DCB4D607;"/>
-					<element geometry="Left=595;Top=396;Right=806;Bottom=466;" subject="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" seqno="9" style="DUID=282A0F3E;NSL=0;"/>
-					<element geometry="Left=280;Top=515;Right=530;Bottom=668;" 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=917F7CA0;"/>
+					<element geometry="Left=1580;Top=717;Right=1878;Bottom=776;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" 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=DCB4D607;"/>
+					<element geometry="Left=695;Top=420;Right=906;Bottom=490;" subject="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" seqno="9" style="DUID=282A0F3E;NSL=0;"/>
+					<element geometry="Left=513;Top=515;Right=675;Bottom=573;" 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=917F7CA0;"/>
 					<element geometry="Left=1580;Top=349;Right=1847;Bottom=455;" 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=C685D329;"/>
-					<element geometry="Left=1014;Top=402;Right=1104;Bottom=462;" subject="EAID_0CC18385_984E_4d4c_A942_07304CE66481" seqno="12" style="NSL=0;DUID=86E72452;"/>
-					<element geometry="SX=61;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1174:-211$;" subject="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" style="Mode=3;EOID=E60386D6;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;EX=-1;EY=-16;SX=-1;SY=-17;$LLB=;LLT=;LMT=;LMB=;LRT=CX=147:CY=27: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=C685D329;SOID=DCB4D607;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;EX=83;EY=15;SX=1;SY=11;$LLB=;LLT=;LMT=;LMB=;LRT=CX=141:CY=27: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=C685D329;SOID=DCB4D607;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=2;EX=70;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=27:OX=95:OY=-30:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6: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=475:-301$;" subject="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999" style="Mode=3;EOID=917F7CA0;SOID=69B63BAD;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=127:CY=27:OX=88: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_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" style="Mode=3;EOID=282A0F3E;SOID=69B63BAD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=1048;Top=425;Right=1138;Bottom=485;" subject="EAID_0CC18385_984E_4d4c_A942_07304CE66481" seqno="12" style="NSL=0;DUID=86E72452;"/>
+					<element geometry="SX=0;SY=21;EX=-49;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1276:-553$;" subject="EAID_7B3A32F2_68B4_4cca_AA0C_F4AAB1D0346B" style="Mode=3;EOID=E60386D6;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=75;EY=-28;SX=75;SY=-29;$LLB=;LLT=;LMT=;LMB=;LRT=CX=170:CY=14:OX=153: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_AE377F2A_EF0B_4bd7_8D4A_95B9DD217458" style="Mode=3;EOID=C685D329;SOID=DCB4D607;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=77;EY=13;SX=3;SY=9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=164:CY=14:OX=151:OY=20: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_3284019D_3E6C_424a_AACD_8319D1389BB9" style="Mode=3;EOID=C685D329;SOID=DCB4D607;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=9;EX=11;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=91:OY=-22:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=6: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=605:-303$;" subject="EAID_56C46ECB_7950_4db1_AA23_2C9AD7E8E999" style="Mode=3;EOID=917F7CA0;SOID=69B63BAD;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=150:CY=14:OX=81: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_29EB89B4_BF73_4250_B00A_CDF53D99CBCD" style="Mode=3;EOID=282A0F3E;SOID=69B63BAD;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-91;SY=0;EX=55;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=E60386D6;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-113;SY=0;EX=0;EY=1;$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=1360:-431$;" subject="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C" style="Mode=3;EOID=86E72452;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;EX=-6;EY=0;SX=-4;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=68: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=2080:-751$399:-751$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=917F7CA0;SOID=DCB4D607;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=91:CY=27:OX=67: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=1725:-589$;" subject="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" style="Mode=3;EOID=C685D329;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=-21: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_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" style="Mode=3;EOID=86E72452;SOID=282A0F3E;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-53;SY=0;EX=1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120:CY=27:OX=87: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_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1" style="Mode=3;EOID=86E72452;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118: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_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=C0ADFCA5;SOID=C09DCFDC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-113;SY=0;EX=0;EY=1;$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=1360:-454$;" subject="EAID_384E8446_C9A6_4e30_9DD7_3219683AAD0C" style="Mode=3;EOID=86E72452;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;EX=0;EY=0;SX=-149;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=66:OY=33: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=594:-746$;" subject="EAID_6CDB7A9B_1395_4587_9F41_FE45FA8A0605" style="Mode=3;EOID=917F7CA0;SOID=DCB4D607;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-7;EX=-49;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=103:OY=16: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=1664:-580$;" subject="EAID_6D0F07D8_06B8_43e0_AB80_8F686D5C488E" style="Mode=3;EOID=C685D329;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=1: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_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" style="Mode=3;EOID=86E72452;SOID=282A0F3E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-53;SY=0;EX=1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143: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=;" subject="EAID_BB4CF849_5E86_494d_AD24_2A89B4A5DAF1" style="Mode=3;EOID=86E72452;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=4;SY=-9;EX=4;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118: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_9663763E_2F48_4952_926C_444F368462AA" style="Mode=3;EOID=C0ADFCA5;SOID=C09DCFDC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-61;SY=-5;EX=-45;EY=-5;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_E9C9B328_DB7C_4af2_A37A_DA236E1A8FE3" style="Mode=3;EOID=F7FA968D;SOID=C09DCFDC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-9;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=71:CY=27:OX=60: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=1703:-539$;" subject="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" style="Mode=3;EOID=C685D329;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;EX=0;EY=0;SX=12;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=0: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=1125:-698$;" subject="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA" style="Mode=3;EOID=CC6DC639;SOID=C09DCFDC;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=1318;SCTR.TOP=-175;SCTR.RIGHT=1417;SCTR.BOTTOM=-120;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=40:OX=141:OY=-60:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1417:-158$1417:-120$1318:-120$1318:-158$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=E60386D6;SOID=E60386D6;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-41;SY=0;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=27:OX=6: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=1432:-692$;" subject="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3" style="Mode=3;EOID=CC6DC639;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-46;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94: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=1067:-788$1924:-788$1924:-413$;" subject="EAID_A13D1892_1403_4dcc_B7C6_33C21269E183" style="Mode=3;EOID=C685D329;SOID=C09DCFDC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=0;EY=-2;SX=-22;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127: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=1091:-689$;" subject="EAID_9D50C424_E7E2_4c52_B4E8_8A666E94C5BA" style="Mode=3;EOID=CC6DC639;SOID=C09DCFDC;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=1316;SCTR.TOP=-256;SCTR.RIGHT=1415;SCTR.BOTTOM=-201;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=40:OX=141:OY=-60:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1415:-239$1415:-201$1316:-201$1316:-239$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=E60386D6;SOID=E60386D6;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=5;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111: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=1478:-689$;" subject="EAID_E1801D29_495B_4d90_9640_5358E5CE90C3" style="Mode=3;EOID=CC6DC639;SOID=C0ADFCA5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<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-07-12 10:57:07"/>
+				<project author="lps" version="1.0" created="2022-01-18 11:59:09" modified="2023-09-11 16:03: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=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=F865276C;"/>
+				<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;"/>
 				<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=909;Top=319;Right=999;Bottom=347;" subject="EAID_081A5F7A_C58F_4abb_B901_B09C711333F4" seqno="2" style="DUID=FC1FDB3B;NSL=0;"/>
-					<element geometry="Left=1224;Top=417;Right=1314;Bottom=487;" 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=226;Top=688;Right=625;Bottom=918;" subject="EAID_D1C941B1_19EE_417c_8201_33A33284BEAA" seqno="4" style="DUID=BE9B0A2A;"/>
-					<element geometry="Left=576;Top=74;Right=750;Bottom=159;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="5" style="DUID=F4E9F7AB;"/>
-					<element geometry="Left=741;Top=315;Right=885;Bottom=353;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="6" style="DUID=7515E77C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1209;Top=303;Right=1330;Bottom=364;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="7" style="DUID=7750CD71;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=79;Top=487;Right=357;Bottom=598;" 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=9BCB082E;"/>
-					<element geometry="Left=310;Top=270;Right=542;Bottom=397;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="9" 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=474;Top=512;Right=586;Bottom=550;" 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=10852AC7;"/>
-					<element geometry="Left=1034;Top=303;Right=1155;Bottom=364;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="11" 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;$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="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;"/>
+					<element geometry="Left=741;Top=315;Right=885;Bottom=353;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="5" style="DUID=7515E77C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1212;Top=302;Right=1383;Bottom=363;" subject="EAID_93ACA540_2668_42d3_BE40_C921C05C776E" seqno="6" style="DUID=7750CD71;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<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="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;"/>
-					<element geometry="SX=-22;SY=0;EX=-22;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_55FB6FB6_1605_4f39_BFBE_32CA1C1F5228" style="Mode=3;EOID=0F5E48DC;SOID=BE9B0A2A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-3;SY=-22;EX=-3;EY=-21;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_6F3635F3_387D_467a_95E2_ACDA293AE181" style="Mode=3;EOID=B8E8B66C;SOID=F4E9F7AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-1;SY=20;EX=-1;EY=21;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=;" subject="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" style="Mode=3;EOID=B8E8B66C;SOID=F4E9F7AB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=1;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1332:-509$;" subject="EAID_71953D29_84AD_4774_9664_258E887283AF" style="Mode=1;EOID=F4E9F7AB;SOID=7515E77C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=2;EX=0;EY=18;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135: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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=0F5E48DC;SOID=7515E77C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-37;EX=-5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=525:-579$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=10852AC7;SOID=9BCB082E;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
+					<element geometry="SX=0;SY=-37;EX=-5;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=525:-567$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=10852AC7;SOID=9BCB082E;Color=-1;LWidth=0;TREE=OR;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=17;SY=20;EX=-65;EY=-40;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=1;EOID=0F5E48DC;SOID=9BCB082E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=13;SY=-6;EX=71;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=860:-555$895:-555$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=1;EOID=0F5E48DC;SOID=10852AC7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=29;EX=41;EY=7;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66: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=;" subject="EAID_67F11C76_D909_4610_841A_BB8035525574" style="Mode=3;EOID=B8E8B66C;SOID=7750CD71;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D6AB3946_257D_4382_A283_8978FB00BD51" style="Mode=3;EOID=F332EE56;SOID=7750CD71;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=44: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_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=B8E8B66C;SOID=F332EE56;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-41;SY=-10;EX=-41;EY=-10;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=44: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_608CC8C6_3A48_4541_8467_9DDA71E8D534" style="Mode=3;EOID=B8E8B66C;SOID=F332EE56;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=10852AC7;SOID=F332EE56;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=31;SY=-5;EX=31;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=63: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_55771AD3_C775_4324_AEBA_EA277D05F7E8" style="Mode=3;EOID=B8E8B66C;SOID=F332EE56;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_1F377807_9517_4c3c_A2B6_E0A40232AB6F">
 				<model package="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" localID="300" owner="EAPK_73E8F652_9D0B_4be2_A5D2_5EC0D734782C" tpos="2"/>
 				<properties name="procurement object relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-02-24 09:53:19" modified="2023-07-12 18:11:11"/>
+				<project author="andreea" version="1.0" created="2022-02-24 09:53:19" modified="2023-09-11 16:06: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=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=C90FC7AF;"/>
+				<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=358BA497;"/>
 				<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=874;Top=673;Right=964;Bottom=733;" subject="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" seqno="1" style="DUID=6B5BF006;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1065;Top=526;Right=1270;Bottom=596;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="2" style="DUID=2987CFE0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=320;Top=526;Right=435;Bottom=569;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="3" style="DUID=64573B83;NSL=0;BCol=-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=55;Right=762;Bottom=125;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="4" style="DUID=13315DC2;NSL=0;BCol=-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=181;Right=441;Bottom=241;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="5" style="DUID=243049E0;NSL=0;BCol=-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=155;Right=889;Bottom=225;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="6" style="DUID=5A57584F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1050;Top=399;Right=1221;Bottom=469;" subject="EAID_3780AA50_D898_4068_B300_47B46651CA0A" seqno="7" style="DUID=0F83CB60;NSL=0;BCol=-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=526;Right=964;Bottom=596;" subject="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" seqno="8" style="DUID=DE1C93D7;NSL=0;BCol=-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=526;Right=649;Bottom=596;" subject="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" seqno="9" style="DUID=303120C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1056;Top=155;Right=1146;Bottom=225;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="10" style="DUID=6FEC455E;NSL=0;BCol=-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=270;Right=384;Bottom=340;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="11" style="DUID=0D80C11B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=56;Top=357;Right=227;Bottom=427;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="12" style="DUID=447368AC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=189;Top=632;Right=467;Bottom=733;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="13" style="DUID=FC8DADD2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1065;Top=315;Right=1206;Bottom=350;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="14" style="DUID=94647E19;NSL=0;BCol=-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=647;Right=820;Bottom=717;" subject="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" seqno="15" style="DUID=4C3C00F4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=560;Top=290;Right=792;Bottom=475;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="16" style="DUID=C040BA3F;NSL=0;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=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1167:-95$;" subject="EAID_71953D29_84AD_4774_9664_258E887283AF" style="Mode=3;EOID=13315DC2;SOID=94647E19;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=-3;SX=85;SY=0;EDGE=3;$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=761:-564$;" subject="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" style="Mode=3;EOID=DE1C93D7;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-86;SY=2;EX=26;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=70:CY=14:OX=42: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_0F625CFF_139F_4712_8BB6_681888ACB178" style="Mode=3;EOID=303120C0;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=79;EX=4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=1105:-303$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=6FEC455E;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-55;SY=0;EX=0;EY=5;$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=621:-206$;" subject="EAID_2FC633C9_64DB_4b46_9190_197D4A4F4C63" style="Mode=3;EOID=243049E0;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=81: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_81D470D5_433B_4242_826E_974C4A3AEF87" style="Mode=3;EOID=4C3C00F4;SOID=C040BA3F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=203;Top=99;Right=470;Bottom=187;" subject="EAID_1F273DD7_0EFA_43d2_9B44_2FCDD6AB5C9D" seqno="1" style="DUID=5475D18E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=423;Top=865;Right=630;Bottom=953;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="DUID=EB5F96C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=540;Top=769;Right=630;Bottom=829;" subject="EAID_62AEA02F_28F9_411d_9AF4_B6398F78199C" 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=3ECD968A;"/>
+					<element geometry="Left=943;Top=805;Right=1033;Bottom=865;" subject="EAID_E55F2451_5826_4907_B311_4F37313BAEF6" seqno="4" style="DUID=6B5BF006;NSL=0;BCol=-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=658;Right=1339;Bottom=728;" subject="EAID_F9677E04_DED2_4052_8D25_BA714BA9C3EC" seqno="5" style="DUID=2987CFE0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=261;Top=651;Right=376;Bottom=694;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="6" style="DUID=64573B83;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=650;Top=191;Right=821;Bottom=261;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="7" style="DUID=13315DC2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=636;Top=292;Right=726;Bottom=352;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="8" style="DUID=243049E0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=868;Top=287;Right=958;Bottom=357;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="9" style="DUID=5A57584F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1119;Top=531;Right=1290;Bottom=601;" subject="EAID_3780AA50_D898_4068_B300_47B46651CA0A" seqno="10" style="DUID=0F83CB60;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=943;Top=658;Right=1033;Bottom=728;" subject="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" seqno="11" style="DUID=DE1C93D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=459;Top=651;Right=630;Bottom=721;" subject="EAID_495BBB92_468A_4f08_9330_A0C75730B97A" seqno="12" style="DUID=303120C0;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1125;Top=287;Right=1215;Bottom=357;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="13" style="DUID=6FEC455E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=233;Top=402;Right=453;Bottom=472;" subject="EAID_67406FC0_EABC_4d83_B727_BC88B30CF43C" seqno="14" style="DUID=0D80C11B;NSL=0;BCol=-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=489;Right=296;Bottom=559;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="15" style="DUID=447368AC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=133;Top=748;Right=411;Bottom=849;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="16" style="DUID=FC8DADD2;NSL=0;BCol=-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=456;Right=1275;Bottom=491;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="17" style="DUID=94647E19;NSL=0;BCol=-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=780;Right=931;Bottom=850;" subject="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" seqno="18" style="DUID=4C3C00F4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=612;Top=422;Right=861;Bottom=607;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="19" style="DUID=C040BA3F;NSL=0;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=1;EX=0;EY=1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=91:CY=14:OX=-11:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=C040BA3F;SOID=447368AC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-3;SX=80;SY=0;EDGE=3;$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=816:-696$;" subject="EAID_0823E4D3_4706_4097_A6E7_D6BCEF598E62" style="Mode=3;EOID=DE1C93D7;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;SX=-44;SY=0;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=70: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=692:-686$;" subject="EAID_0F625CFF_139F_4712_8BB6_681888ACB178" style="Mode=3;EOID=303120C0;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=79;EX=4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=1174:-435$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=6FEC455E;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-55;SY=0;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79:CY=14:OX=46: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_2FC633C9_64DB_4b46_9190_197D4A4F4C63" style="Mode=3;EOID=243049E0;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=16;EY=1;SX=16;SY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=81: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_81D470D5_433B_4242_826E_974C4A3AEF87" style="Mode=3;EOID=4C3C00F4;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-109;SY=0;EX=0;EY=-29;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=627:-172$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=5475D18E;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AB768772_FAC4_4353_A1C6_F384FEC304AE" style="Mode=3;EOID=13315DC2;SOID=C040BA3F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-61;EX=2;EY=7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83: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_ADE68ED4_8A73_411c_B751_1F0998CC86A7" style="Mode=3;EOID=0F83CB60;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=52;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-11: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=728:-193$;" subject="EAID_818697AF_821C_40da_B5DE_D7ED82169378" style="Mode=3;EOID=5A57584F;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=59;EX=-2;EY=-4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102: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=;" subject="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" style="Mode=3;EOID=0D80C11B;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-18;SY=4;EX=-18;EY=40;$LLB=;LLT=;LMT=;LMB=;LRT=CX=135: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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=C040BA3F;SOID=94647E19;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-1;SY=0;EX=0;EY=-74;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=376:-456$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=C040BA3F;SOID=64573B83;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=5;SY=7;EX=2;EY=7;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=52: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_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" style="Mode=3;EOID=0F83CB60;SOID=94647E19;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-75;SY=0;EX=0;EY=-48;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=253:-430$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=C040BA3F;SOID=FC8DADD2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=5;SY=-3;EX=6;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=94: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=64573B83;SOID=FC8DADD2;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=91: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_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=C040BA3F;SOID=447368AC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=32;SY=0;EX=0;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1236:-231$;" subject="EAID_71953D29_84AD_4774_9664_258E887283AF" style="Mode=3;EOID=13315DC2;SOID=94647E19;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=5;EX=3;EY=5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=99:CY=14:OX=52: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_2D4516BD_7CD7_4f69_89C8_D3FC52D7CF0C" style="Mode=3;EOID=0F83CB60;SOID=94647E19;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=48;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=-11: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=784:-325$;" subject="EAID_818697AF_821C_40da_B5DE_D7ED82169378" style="Mode=3;EOID=5A57584F;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=127;SY=-8;EX=-1;EY=-8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=94: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=64573B83;SOID=FC8DADD2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=0;EX=0;EY=-74;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=317:-588$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=C040BA3F;SOID=64573B83;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-63;SY=33;EX=-63;EY=-5;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=180:CY=14:OX=126:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=-1;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_C35EEDCE_0633_482d_BA4A_4553057B7C23" style="Mode=3;EOID=5475D18E;SOID=0D80C11B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-41;SY=33;EX=-41;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=175:CY=14:OX=160: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_91D18452_424C_4f36_8E1E_BF993F4D765A" style="Mode=3;EOID=5475D18E;SOID=0D80C11B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=20;SY=-4;EX=27;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=145:CY=14:OX=136:OY=13: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_72A6C38F_77C6_4480_A13E_A5E9A66D9379" style="Mode=3;EOID=5475D18E;SOID=0D80C11B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_285BF543_AB60_4346_9E70_090B7DE95623" style="Mode=3;EOID=5A57584F;SOID=6FEC455E;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;EX=11;EY=-2;SX=11;SY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105: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_3C2D8165_83BF_498f_B03B_E256F94C76B5" style="Mode=3;EOID=3ECD968A;SOID=303120C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-36;SY=-15;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=14:OX=39: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_ED25B2CF_BC4D_44e9_957C_60FF1C08941F" style="Mode=3;EOID=EB5F96C0;SOID=303120C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-29;EY=1;SX=-27;SY=-12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=129:CY=14:OX=68: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_95D11AFD_5F07_4159_ABF2_BA01D9E3FEE4" style="Mode=3;EOID=6B5BF006;SOID=DE1C93D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=45;SY=-3;EX=34;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110: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_74371426_1670_46df_8526_5A4910F24815" style="Mode=3;EOID=6B5BF006;SOID=DE1C93D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=0;EX=24;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93: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=;" subject="EAID_55AE0CEF_3CD9_464a_82E7_387507253B10" style="Mode=3;EOID=2987CFE0;SOID=DE1C93D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-2;SY=59;EX=-2;EY=-4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102: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=;" subject="EAID_93203FD8_0FBB_48f1_B54C_5FBB7973D2FA" style="Mode=3;EOID=0D80C11B;SOID=C040BA3F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=2;SY=0;EX=0;EY=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=101: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=737:-140$;" subject="EAID_77A962A1_6ADC_4a69_9C87_1543CFCC17D9" style="Mode=3;EOID=5475D18E;SOID=13315DC2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_95FB9493_C207_456a_A0EF_B68899832EE8" style="Mode=3;EOID=EB5F96C0;SOID=13315DC2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6F3635F3_387D_467a_95E2_ACDA293AE181" style="Mode=3;EOID=EB5F96C0;SOID=13315DC2;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=-75;SY=0;EX=0;EY=-53;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=197:-567$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=C040BA3F;SOID=FC8DADD2;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_AB634BF8_27DF_4150_83AB_3091E780E74A">
@@ -46091,25 +48367,24 @@
 					<element geometry="Left=1544;Top=247;Right=1776;Bottom=384;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="20" style="DUID=04F4B7AF;NSL=0;BCol=-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=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=3;SX=115;SY=0;EX=0;EY=-11;$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=1824:-765$;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=5B505355;SOID=86800DEB;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=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="EDGE=2;SX=0;SY=43;EX=-31;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=63: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=1678:-848$;" 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=-12;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=633:-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="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=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=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="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="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=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=115;SY=0;EX=0;EY=-11;$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=1824:-765$;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=5B505355;SOID=86800DEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-23;SY=-2;EX=-23;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=04F4B7AF;SOID=86800DEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=41;EX=0;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=BFABB571;SOID=86800DEB;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=37;EY=2;SX=37;SY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=44: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_F955E894_651A_4a8b_A411_E8DA312BC449" style="Mode=3;EOID=C1D2D067;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=11;EY=-32;SX=11;SY=-32;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" style="Mode=3;EOID=96B18613;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=1;EY=39;SX=1;SY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=112: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_3BC5D7DE_3CD8_46c6_9B27_A7A4C7B70604" style="Mode=3;EOID=96B18613;SOID=E3AA0701;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<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=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=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="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="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=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;"/>
@@ -46118,25 +48393,25 @@
 					<element geometry="EDGE=2;SX=-16;SY=-12;EX=-16;EY=-54;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152:CY=14:OX=-16: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_56C46ECB_7950_4db1_AA23_2C9AD7E8E999" style="Mode=3;EOID=86800DEB;SOID=99C69F38;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<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=43;EX=-31;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=63: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=1678:-848$;" 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=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=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=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=2;SX=0;SY=-1;EX=-80;EY=0;$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=1629:-722$;" 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=56;SY=-10;EX=58;EY=-10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=78: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=134;SY=-6;EX=97;EY=-6;$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;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=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=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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_67528027_031E_41eb_BD84_3064F9C119CE">
 				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" localID="247" owner="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" tpos="1"/>
 				<properties name="agent hierarchy" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-01-21 10:24:37" modified="2023-07-12 18:25:19"/>
+				<project author="andreea" version="1.0" created="2022-01-21 10:24:37" modified="2023-08-31 17:41: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=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=8746614C;"/>
+				<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=A8090D45;"/>
 				<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/>
@@ -46150,6 +48425,7 @@
 					<element geometry="Left=22;Top=432;Right=231;Bottom=559;" subject="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" seqno="7" style="DUID=D1574D2C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=326;Top=242;Right=579;Bottom=356;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="8" style="DUID=42D4CEE6;NSL=0;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_24AB8D4E_3151_4d4e_B951_BAA8F8436033" style="Mode=3;EOID=BFB40E3E;SOID=33574B37;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=564;SCTR.TOP=-250;SCTR.RIGHT=595;SCTR.BOTTOM=-225;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=63:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=579:-250$595:-250$595:-225$564:-225$564:-242$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=42D4CEE6;SOID=42D4CEE6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=-7;EX=1;EY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=1;EOID=BFB40E3E;SOID=42D4CEE6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" style="Mode=1;EOID=33574B37;SOID=D1574D2C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=10;SY=0;EX=29;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" style="Mode=3;EOID=42D4CEE6;SOID=1D896507;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -46165,9 +48441,9 @@
 			<diagram xmi:id="EAID_C3BE0EED_5148_49f7_A0F0_EAE9D586743F">
 				<model package="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" localID="326" owner="EAPK_E1382CA6_03C9_4d3d_8C1D_A9BA47C27626" tpos="2"/>
 				<properties name="agent relations" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-04-25 14:17:48" modified="2023-07-12 18:22:59"/>
+				<project author="lps" version="1.0" created="2022-04-25 14:17:48" modified="2023-09-11 16:16: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=B32652D6;"/>
+				<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=5CE31F2C;"/>
 				<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/>
@@ -46178,8 +48454,8 @@
 					<element geometry="Left=749;Top=268;Right=913;Bottom=353;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" 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=23026E55;"/>
 					<element geometry="Left=1044;Top=360;Right=1218;Bottom=430;" subject="EAID_DC5A8DC6_4D0A_4432_B667_CE2C1E6D5A96" 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=A8644FC1;"/>
 					<element geometry="Left=1066;Top=530;Right=1156;Bottom=606;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" 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=6394AE27;"/>
-					<element geometry="Left=722;Top=753;Right=924;Bottom=823;" 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=D5214884;"/>
-					<element geometry="Left=1042;Top=763;Right=1175;Bottom=813;" subject="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" 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=99696D71;"/>
+					<element geometry="Left=726;Top=743;Right=928;Bottom=813;" 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=D5214884;"/>
+					<element geometry="Left=1044;Top=753;Right=1177;Bottom=803;" subject="EAID_52205A3C_8FF4_4195_8C11_F71753C30F8E" 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=99696D71;"/>
 					<element geometry="Left=602;Top=656;Right=692;Bottom=726;" subject="EAID_48133D6A_BE44_43c9_A647_04650698EC95" 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=C8D50DB4;"/>
 					<element geometry="Left=408;Top=656;Right=597;Bottom=726;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" 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=5FD86980;"/>
 					<element geometry="Left=786;Top=411;Right=876;Bottom=446;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="11" style="DUID=1C77B14E;"/>
@@ -46191,8 +48467,9 @@
 					<element geometry="SX=39;SY=57;EX=39;EY=38;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=6394AE27;SOID=53E7DE0E;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=2;EX=8;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119: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=186:-477$;" subject="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" style="Mode=3;EOID=373E10B8;SOID=53E7DE0E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-9;SY=0;EX=-37;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=503:-387$794:-387$;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=23026E55;SOID=53E7DE0E;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=357;SCTR.TOP=-442;SCTR.RIGHT=425;SCTR.BOTTOM=-412;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=53:OY=-29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=425:-422$425:-412$357:-412$357:-442$386:-442$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=53E7DE0E;SOID=53E7DE0E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-20;EX=0;EY=30;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=95:CY=14:OX=-29: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=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=69:-499$69:-101$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=442B6059;SOID=53E7DE0E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-35;EX=0;EY=59;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88: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=-10:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=51:-514$51:-72$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=442B6059;SOID=53E7DE0E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-40;EX=0;EY=59;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88: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=-10:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=54:-519$54:-72$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=442B6059;SOID=53E7DE0E;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=99;SY=15;EX=24;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=CX=81: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=;" subject="EAID_677B606B_352C_459b_9644_C85CAC550728" style="Mode=3;EOID=6394AE27;SOID=B0E24C1E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=-1;SX=0;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" style="Mode=3;EOID=1C77B14E;SOID=B0E24C1E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=99;SY=-28;EX=3;EY=-28;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97: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_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" style="Mode=3;EOID=6394AE27;SOID=B0E24C1E;Color=-1;LWidth=0;Hidden=0;"/>
@@ -46200,13 +48477,13 @@
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" style="Mode=3;EOID=23026E55;SOID=1C77B14E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=35;SY=-22;EX=96;EY=-15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=53E7DE0E;SOID=5FD86980;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=6;SY=-7;EX=6;EY=-7;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_D56DDC19_B837_4e3f_B996_A8D529DA32A2" style="Mode=3;EOID=442B6059;SOID=3537F7C6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=7;SY=0;EX=10;EY=-2;$LLB=CX=17:CY=14:OX=6:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=105:CY=14:OX=68:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=103:CY=14:OX=71:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-39:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" style="Mode=3;EOID=B0E24C1E;SOID=D5214884;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=5;SY=0;EX=8;EY=-2;$LLB=CX=17:CY=14:OX=6:OY=2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=105:CY=14:OX=68:OY=-19:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=103:CY=14:OX=71:OY=18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-39:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_610783CB_543D_493b_8D89_2DD66914E4DD" style="Mode=3;EOID=B0E24C1E;SOID=D5214884;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=0;SY=-2;EX=-66;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88: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=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0A05E1A7_A032_44d5_8A47_A62DAC97C6A3" style="Mode=3;EOID=99696D71;SOID=D5214884;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=-8;EX=0;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=705:-796$705:-464$;" subject="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" style="Mode=3;EOID=53E7DE0E;SOID=D5214884;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=4;SX=0;SY=-8;EX=0;EY=15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=705:-786$705:-464$;" subject="EAID_A2F10537_FAE7_4ff3_A3EE_819F014FE1AC" style="Mode=3;EOID=53E7DE0E;SOID=D5214884;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-3;EX=28;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=859:-398$;" subject="EAID_80B8D836_6545_4db6_8C20_4A9289C81C12" style="Mode=3;EOID=23026E55;SOID=A8644FC1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-4;SY=0;EX=0;EY=14;$LLB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LLT=CX=75:CY=14:OX=39:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LMT=;LMB=;LRT=CX=93: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=4:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1127:-296$;" subject="EAID_EBF47D81_D8E3_4eda_9351_165A2D6D972E" style="Mode=3;EOID=23026E55;SOID=A8644FC1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=2;SY=41;EX=9;EY=8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66: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=-3: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=442B6059;SOID=23026E55;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=5;EY=-8;EDGE=4;SX=5;SY=-8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=27:OX=3:OY=-12: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_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=373E10B8;SOID=BB6034EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=5;EY=-8;EDGE=4;SX=5;SY=-8;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=27:OX=-1:OY=-14: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_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=373E10B8;SOID=BB6034EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=33;SY=-4;EX=33;EY=-11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61: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_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=23026E55;SOID=BB6034EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-55;SY=0;EX=0;EY=-42;EDGE=1;$LLB=;LLT=;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=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=405:-231$;" subject="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=716AFA8F;SOID=BB6034EE;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=88:CY=14:OX=49: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_2C904936_FC7D_45f3_AFEF_E5B428B672AA" style="Mode=3;EOID=3537F7C6;SOID=BB6034EE;Color=-1;LWidth=0;Hidden=0;"/>
@@ -46216,9 +48493,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="2023-06-22 15:06:10"/>
+				<project author="andreea" version="1.0" created="2023-04-11 11:12:53" modified="2023-09-11 16:16:00"/>
 				<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=595F9119;"/>
+				<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=A670D187;"/>
 				<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/>
@@ -46226,38 +48503,39 @@
 					<element geometry="Left=96;Top=325;Right=349;Bottom=449;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="1" style="DUID=EB9AF0E8;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1068;Top=368;Right=1239;Bottom=438;" subject="EAID_68E68E66_FDF5_4801_BCD0_09D751D046C7" seqno="2" style="DUID=FB5AC708;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=866;Top=471;Right=956;Bottom=503;" subject="EAID_BAEE0189_A777_46c7_A426_F3B02E584BAC" seqno="3" style="DUID=046BCD20;"/>
-					<element geometry="Left=1044;Top=93;Right=1263;Bottom=178;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="DUID=B8C4294C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1044;Top=112;Right=1263;Bottom=197;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="DUID=B8C4294C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1023;Top=471;Right=1138;Bottom=577;" subject="EAID_3F8D61CD_1627_41f0_9DF2_72A3B2890959" seqno="5" style="DUID=0AFB87B9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=463;Top=311;Right=665;Bottom=464;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="6" style="DUID=D331DD1B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=461;Top=533;Right=668;Bottom=621;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="7" style="DUID=9FBADE63;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=825;Top=116;Right=996;Bottom=186;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="8" style="DUID=AD5F0CAD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=465;Top=65;Right=662;Bottom=206;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" 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=6E5E4E25;"/>
+					<element geometry="Left=825;Top=155;Right=996;Bottom=225;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="8" style="DUID=AD5F0CAD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=465;Top=84;Right=662;Bottom=225;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" 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=6E5E4E25;"/>
 					<element geometry="Left=821;Top=290;Right=1001;Bottom=360;" subject="EAID_F8CEA30E_956C_4e31_A38C_468EBD36551A" 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=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="EDGE=4;SX=0;SY=-3;EX=0;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113: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=;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=6E5E4E25;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=49: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_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;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0DF6152A_D2C0_4f8c_A6A9_A94ADE3ECB16" style="Mode=3;EOID=B7C202D9;SOID=0AFB87B9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-5;SX=-75;SY=0;EDGE=3;$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=836:-582$;" subject="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2" style="Mode=3;EOID=9FBADE63;SOID=B7C202D9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=4;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119: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=226:-137$;" subject="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" style="Mode=3;EOID=6E5E4E25;SOID=EB9AF0E8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=0: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_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=6E5E4E25;SOID=AD5F0CAD;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=0;EX=0;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119: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=226:-156$;" subject="EAID_C2D44282_10C8_422c_82F3_D4CC50B411F4" style="Mode=3;EOID=6E5E4E25;SOID=EB9AF0E8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49:CY=14: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=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="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="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=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_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=;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=4;$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=49: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=D331DD1B;SOID=6E5E4E25;Color=-1;LWidth=0;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="EX=0;EY=-5;SX=-75;SY=0;EDGE=3;$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=836:-582$;" subject="EAID_D56DDC19_B837_4e3f_B996_A8D529DA32A2" style="Mode=3;EOID=9FBADE63;SOID=B7C202D9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_F4E49053_6DAE_4623_8769_61637C57A452">
 				<model package="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" localID="162" owner="EAPK_D5932E9C_1D48_4086_9A70_026ECCA134EF" tpos="4"/>
 				<properties name="role relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-21 11:24:32" modified="2023-07-12 18:38:52"/>
+				<project author="andreea" version="1.0" created="2021-12-21 11:24:32" modified="2023-09-11 16:29: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=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=2CF2D3E8;"/>
+				<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=8A7ECB8F;"/>
 				<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/>
@@ -46277,7 +48555,7 @@
 					<element geometry="Left=416;Top=372;Right=590;Bottom=444;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="13" style="DUID=357829A1;"/>
 					<element geometry="Left=914;Top=358;Right=1182;Bottom=472;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" seqno="14" style="DUID=EACFF445;NSL=0;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=0;SY=0;EX=5;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=70: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=1391:-415$;" subject="EAID_1FFF54A3_B491_40f9_AB43_E5A825C5F2E2" style="Mode=3;EOID=84AF6444;SOID=EACFF445;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=5;SY=0;EX=0;EY=-17;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=27:OX=15:OY=-15: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=508:-154$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=25AA1564;SOID=357829A1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=5;SY=0;EX=0;EY=-17;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113: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=-1:OY=4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=508:-154$;" subject="EAID_4B6E629B_BECA_4e04_B7C9_925B517BC914" style="Mode=3;EOID=25AA1564;SOID=357829A1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=3;SY=0;EX=3;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=-5: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_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=69D4BF7C;SOID=357829A1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=91:CY=14:OX=7: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=;" subject="EAID_A324A6A5_CBDA_4f14_91FB_B8F7B19FEB4B" style="Mode=3;EOID=C13547BD;SOID=357829A1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-57;SY=0;EX=0;EY=14;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88: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=1:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=446:-253$;" subject="EAID_2C904936_FC7D_45f3_AFEF_E5B428B672AA" style="Mode=3;EOID=12D16B92;SOID=357829A1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -46293,9 +48571,10 @@
 					<element geometry="SX=-26;SY=-3;EX=-71;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=55: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_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=6D3A2860;SOID=EACFF445;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=69D4BF7C;SOID=EACFF445;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=33;SY=2;EX=77;EY=3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49:CY=14:OX=41:OY=32: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=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=6D3A2860;SOID=EACFF445;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=1151;SCTR.TOP=-367;SCTR.RIGHT=1201;SCTR.BOTTOM=-336;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=99:OY=-18:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1182:-367$1201:-367$1201:-336$1151:-336$1151:-358$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=EACFF445;SOID=EACFF445;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=9;SY=35;EX=9;EY=35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=A5855475;SOID=EACFF445;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=6;SY=15;EX=6;EY=15;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=A5855475;SOID=EACFF445;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=-6;SY=-2;EX=9;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=29:OY=13:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-33:OY=-3: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=EACFF445;SOID=B9FE7A49;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-6;SY=-2;EX=9;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51:CY=14:OX=30:OY=17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-33:OY=-3: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=EACFF445;SOID=B9FE7A49;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=23;SY=-3;EX=92;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73:CY=14:OX=54:OY=28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;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_0AA8BD10_946A_403c_B906_6DB183F74D9F" style="Mode=3;EOID=EACFF445;SOID=B9FE7A49;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-33;SY=-4;EX=-68;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=EACFF445;SOID=B9FE7A49;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=-12;EY=0;SX=0;SY=-20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76: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_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=4F52C11C;SOID=6D3A2860;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -46304,82 +48583,86 @@
 			<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" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-10-31 11:26:58" modified="2023-07-17 16:49:42"/>
+				<project author="lps" version="1.0" created="2022-10-31 11:26:58" modified="2023-09-11 16:17: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=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=55B475B7;"/>
+				<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=F7D18851;"/>
 				<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=1260;Top=461;Right=1431;Bottom=520;" subject="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" seqno="1" style="DUID=FE0B0D4F;"/>
-					<element geometry="Left=1185;Top=603;Right=1275;Bottom=673;" 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=572;Top=1013;Right=662;Bottom=1048;" 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=2382;Top=526;Right=2472;Bottom=596;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="4" style="DUID=0E34371A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2309;Top=728;Right=2423;Bottom=798;" subject="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" seqno="5" style="DUID=92236F12;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=2333;Top=628;Right=2423;Bottom=698;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="6" style="DUID=4C2B344C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1310;Top=689;Right=1400;Bottom=724;" subject="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" seqno="7" style="DUID=7CA94379;"/>
-					<element geometry="Left=1048;Top=900;Right=1138;Bottom=939;" subject="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" seqno="8" style="DUID=B108D291;"/>
-					<element geometry="Left=1684;Top=675;Right=1774;Bottom=710;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="9" style="DUID=7B6C46D7;"/>
-					<element geometry="Left=1953;Top=546;Right=2043;Bottom=616;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="10" style="DUID=FA3D02D1;"/>
-					<element geometry="Left=664;Top=565;Right=754;Bottom=635;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="11" style="DUID=C821B644;"/>
-					<element geometry="Left=374;Top=1329;Right=490;Bottom=1364;" subject="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" seqno="12" style="DUID=02E431FF;NSL=0;"/>
-					<element geometry="Left=26;Top=764;Right=212;Bottom=799;" subject="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" seqno="13" style="DUID=9D042683;NSL=0;"/>
-					<element geometry="Left=142;Top=818;Right=305;Bottom=853;" subject="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" seqno="14" style="DUID=0D2A89A2;NSL=0;"/>
-					<element geometry="Left=1939;Top=829;Right=2055;Bottom=864;" subject="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" seqno="15" style="NSL=0;DUID=73826C31;"/>
-					<element geometry="Left=224;Top=1170;Right=340;Bottom=1205;" subject="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" seqno="16" style="DUID=E5EA9B40;NSL=0;"/>
-					<element geometry="Left=26;Top=711;Right=142;Bottom=746;" subject="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" seqno="17" style="DUID=E53F83EE;NSL=0;"/>
-					<element geometry="Left=2136;Top=804;Right=2327;Bottom=839;" subject="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" seqno="18" style="NSL=0;DUID=8817DFCA;"/>
-					<element geometry="Left=179;Top=994;Right=306;Bottom=1029;" subject="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" seqno="19" style="DUID=5C0D60DC;NSL=0;"/>
-					<element geometry="Left=1994;Top=763;Right=2136;Bottom=798;" subject="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" seqno="20" style="NSL=0;DUID=E6884F95;"/>
-					<element geometry="Left=246;Top=1365;Right=362;Bottom=1400;" subject="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" seqno="21" style="DUID=507774E7;NSL=0;"/>
-					<element geometry="Left=195;Top=1079;Right=326;Bottom=1114;" subject="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" seqno="22" style="DUID=B7A70CFE;NSL=0;"/>
-					<element geometry="Left=233;Top=1248;Right=349;Bottom=1283;" subject="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" seqno="23" style="DUID=7999185A;NSL=0;"/>
-					<element geometry="Left=550;Top=1191;Right=682;Bottom=1340;" subject="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" seqno="24" style="ImageID=0;DUID=FD0DE1AB;"/>
-					<element geometry="Left=1172;Top=903;Right=1274;Bottom=938;" subject="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" 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=E55F47CF;"/>
-					<element geometry="Left=1621;Top=1162;Right=1711;Bottom=1197;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" 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=F6DB5B3D;"/>
-					<element geometry="Left=624;Top=1093;Right=714;Bottom=1128;" subject="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" seqno="27" style="DUID=A992BCE8;NSL=0;"/>
-					<element geometry="Left=249;Top=902;Right=339;Bottom=937;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" 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=EC6B1D83;"/>
-					<element geometry="Left=1492;Top=1162;Right=1582;Bottom=1197;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" 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=B0B214A7;"/>
-					<element geometry="Left=1817;Top=875;Right=1907;Bottom=910;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="30" style="NSL=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=952;Top=1186;Right=1042;Bottom=1221;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" seqno="31" style="NSL=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=1374;Bottom=1055;" subject="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" 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=E5E05513;"/>
-					<element geometry="Left=1703;Top=1127;Right=1793;Bottom=1162;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" 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=52086AF8;"/>
-					<element geometry="Left=1827;Top=954;Right=1917;Bottom=989;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" 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=EB4BB6E9;"/>
-					<element geometry="Left=1310;Top=947;Right=1400;Bottom=982;" subject="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" 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=66283F9C;"/>
-					<element geometry="Left=1071;Top=1255;Right=1197;Bottom=1290;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" seqno="36" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=7BDDEA03;"/>
-					<element geometry="Left=1071;Top=1020;Right=1211;Bottom=1055;" subject="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" 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=1CE512C3;"/>
-					<element geometry="Left=1445;Top=293;Right=1619;Bottom=363;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="38" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8B6B6E09;"/>
-					<element geometry="Left=142;Top=910;Right=232;Bottom=945;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="39" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AA41C3A2;"/>
-					<element geometry="Left=1541;Top=1328;Right=1656;Bottom=1425;" subject="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" seqno="40" style="DUID=36911C55;ImageID=0;"/>
-					<element geometry="Left=1413;Top=1349;Right=1528;Bottom=1404;" subject="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" seqno="41" style="DUID=19A0301C;ImageID=0;"/>
-					<element geometry="Left=551;Top=1442;Right=666;Bottom=1497;" subject="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" seqno="42" style="DUID=C84F3FC0;ImageID=0;"/>
-					<element geometry="Left=551;Top=1346;Right=666;Bottom=1401;" subject="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" seqno="43" style="DUID=5BD718B3;ImageID=0;"/>
-					<element geometry="Left=1831;Top=707;Right=1914;Bottom=762;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="44" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BB4A93FB;"/>
-					<element geometry="Left=1426;Top=1221;Right=1516;Bottom=1291;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="45" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A1942F03;"/>
-					<element geometry="Left=729;Top=1339;Right=819;Bottom=1409;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="46" style="DUID=800EAACC;NSL=0;"/>
-					<element geometry="Left=872;Top=1409;Right=962;Bottom=1479;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="47" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6E4D2EEF;"/>
-					<element geometry="Left=1048;Top=710;Right=1276;Bottom=811;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="48" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=3F40E56D;"/>
-					<element geometry="Left=1720;Top=1017;Right=1804;Bottom=1061;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="49" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0F029FB6;"/>
-					<element geometry="Left=1486;Top=546;Right=1576;Bottom=616;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="50" style="NSL=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="Left=1349;Top=1098;Right=1448;Bottom=1145;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="51" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=CEC13CC5;"/>
+					<element geometry="Left=2271;Top=457;Right=2361;Bottom=527;" subject="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" seqno="1" style="DUID=F92FADD5;NSL=0;"/>
+					<element geometry="Left=1260;Top=461;Right=1431;Bottom=520;" subject="EAID_081C9A0E_ECFD_40cc_BB3D_C50E4CF84E8D" seqno="2" style="DUID=FE0B0D4F;"/>
+					<element geometry="Left=1185;Top=603;Right=1275;Bottom=673;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="3" 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=572;Top=1013;Right=662;Bottom=1048;" subject="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" seqno="4" 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=2382;Top=526;Right=2472;Bottom=596;" subject="EAID_A6BE0A70_8710_4a7a_A18E_DE28480B6184" seqno="5" style="DUID=0E34371A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2309;Top=728;Right=2423;Bottom=798;" subject="EAID_9099AF4F_0019_4768_B85A_99820F3E6307" seqno="6" style="DUID=92236F12;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=2333;Top=628;Right=2423;Bottom=698;" subject="EAID_CE66C7F9_83F7_479f_89C7_9BC5ACC1EEFB" seqno="7" style="DUID=4C2B344C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1310;Top=689;Right=1400;Bottom=724;" subject="EAID_C52C2B8E_EBBE_4a9a_A48C_B479107AD49E" seqno="8" style="DUID=7CA94379;"/>
+					<element geometry="Left=1048;Top=900;Right=1138;Bottom=939;" subject="EAID_ABEE1795_5EE6_4f51_ACEA_C3F05211F0B3" seqno="9" style="DUID=B108D291;"/>
+					<element geometry="Left=1684;Top=675;Right=1774;Bottom=710;" subject="EAID_EE766D5F_E71C_4027_80A3_BA1B8B406A51" seqno="10" style="DUID=7B6C46D7;"/>
+					<element geometry="Left=1953;Top=546;Right=2043;Bottom=616;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="11" style="DUID=FA3D02D1;"/>
+					<element geometry="Left=664;Top=565;Right=754;Bottom=635;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="12" style="DUID=C821B644;"/>
+					<element geometry="Left=374;Top=1329;Right=490;Bottom=1364;" subject="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" seqno="13" style="DUID=02E431FF;NSL=0;"/>
+					<element geometry="Left=26;Top=764;Right=212;Bottom=799;" subject="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" seqno="14" style="DUID=9D042683;NSL=0;"/>
+					<element geometry="Left=142;Top=818;Right=305;Bottom=853;" subject="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" seqno="15" style="DUID=0D2A89A2;NSL=0;"/>
+					<element geometry="Left=1939;Top=829;Right=2055;Bottom=864;" subject="EAID_CADD27F3_86EF_483f_A036_7DF4251EE09C" seqno="16" style="NSL=0;DUID=73826C31;"/>
+					<element geometry="Left=224;Top=1170;Right=340;Bottom=1205;" subject="EAID_C0F5DE45_CA08_46dd_AD44_E7EF577A809D" seqno="17" style="DUID=E5EA9B40;NSL=0;"/>
+					<element geometry="Left=26;Top=711;Right=142;Bottom=746;" subject="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" seqno="18" style="DUID=E53F83EE;NSL=0;"/>
+					<element geometry="Left=2136;Top=804;Right=2327;Bottom=839;" subject="EAID_A26B1993_0ADD_4f4b_B33D_9CEF05DBC14D" seqno="19" style="NSL=0;DUID=8817DFCA;"/>
+					<element geometry="Left=179;Top=994;Right=306;Bottom=1029;" subject="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" seqno="20" style="DUID=5C0D60DC;NSL=0;"/>
+					<element geometry="Left=1994;Top=763;Right=2136;Bottom=798;" subject="EAID_7A0A8591_894D_4c11_A2EF_EAB3AA90B79D" seqno="21" style="NSL=0;DUID=E6884F95;"/>
+					<element geometry="Left=246;Top=1365;Right=362;Bottom=1400;" subject="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" seqno="22" style="DUID=507774E7;NSL=0;"/>
+					<element geometry="Left=195;Top=1079;Right=326;Bottom=1114;" subject="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" seqno="23" style="DUID=B7A70CFE;NSL=0;"/>
+					<element geometry="Left=233;Top=1248;Right=349;Bottom=1283;" subject="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" seqno="24" style="DUID=7999185A;NSL=0;"/>
+					<element geometry="Left=584;Top=1186;Right=754;Bottom=1298;" subject="EAID_77C73B2B_FAD3_40f6_912A_3F8915E3704C" seqno="25" style="ImageID=0;DUID=FD0DE1AB;"/>
+					<element geometry="Left=1172;Top=903;Right=1274;Bottom=938;" subject="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" 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=E55F47CF;"/>
+					<element geometry="Left=1621;Top=1162;Right=1711;Bottom=1197;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" 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=F6DB5B3D;"/>
+					<element geometry="Left=624;Top=1093;Right=714;Bottom=1128;" subject="EAID_B4F30642_373D_4195_B1E6_10198F138ED8" seqno="28" style="DUID=A992BCE8;NSL=0;"/>
+					<element geometry="Left=249;Top=902;Right=339;Bottom=937;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" 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=EC6B1D83;"/>
+					<element geometry="Left=1492;Top=1162;Right=1582;Bottom=1197;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="30" style="NSL=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=1817;Top=875;Right=1907;Bottom=910;" subject="EAID_72FDF104_AADB_434c_9491_D5301EE0DDE7" seqno="31" style="NSL=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=952;Top=1186;Right=1042;Bottom=1221;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" 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=C875B1C2;"/>
+					<element geometry="Left=1233;Top=1020;Right=1374;Bottom=1055;" subject="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" 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=E5E05513;"/>
+					<element geometry="Left=1703;Top=1127;Right=1793;Bottom=1162;" subject="EAID_56C62F68_CA40_4dde_B4CE_1CC777975EF3" 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=52086AF8;"/>
+					<element geometry="Left=1827;Top=954;Right=1917;Bottom=989;" subject="EAID_4F4F6401_4030_4313_8DD1_1E65B7299BE7" 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=EB4BB6E9;"/>
+					<element geometry="Left=1310;Top=947;Right=1400;Bottom=982;" subject="EAID_4E7C30BC_ABE6_4736_8E07_54ED87CB1179" seqno="36" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=66283F9C;"/>
+					<element geometry="Left=1071;Top=1255;Right=1197;Bottom=1290;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" 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=7BDDEA03;"/>
+					<element geometry="Left=1071;Top=1020;Right=1211;Bottom=1055;" subject="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" seqno="38" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=1CE512C3;"/>
+					<element geometry="Left=1445;Top=293;Right=1619;Bottom=363;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" seqno="39" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=8B6B6E09;"/>
+					<element geometry="Left=142;Top=910;Right=232;Bottom=945;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="40" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=AA41C3A2;"/>
+					<element geometry="Left=1541;Top=1328;Right=1656;Bottom=1425;" subject="EAID_99C9EA13_4E92_4d7b_8019_151D9E58B38C" seqno="41" style="DUID=36911C55;ImageID=0;"/>
+					<element geometry="Left=1413;Top=1349;Right=1528;Bottom=1404;" subject="EAID_E056BB8E_53A6_4c1b_9C27_80EF4AC93B30" seqno="42" style="DUID=19A0301C;ImageID=0;"/>
+					<element geometry="Left=551;Top=1442;Right=666;Bottom=1497;" subject="EAID_F3D5117C_9CF0_4938_8D31_792C8AA2C8AA" seqno="43" style="DUID=C84F3FC0;ImageID=0;"/>
+					<element geometry="Left=551;Top=1346;Right=666;Bottom=1401;" subject="EAID_7B8D0764_DAEA_4469_9A64_2844EDF99658" seqno="44" style="DUID=5BD718B3;ImageID=0;"/>
+					<element geometry="Left=1831;Top=707;Right=1914;Bottom=762;" subject="EAID_78459D23_BCB4_42bb_83F6_F9D8F550B19D" seqno="45" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=BB4A93FB;"/>
+					<element geometry="Left=1426;Top=1221;Right=1516;Bottom=1291;" subject="EAID_65859D73_65BF_4f87_8EF3_D893D4201BD3" seqno="46" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=A1942F03;"/>
+					<element geometry="Left=1555;Top=1221;Right=1645;Bottom=1291;" subject="EAID_50AB4700_C682_4597_AC0A_DF93BCB884C6" seqno="47" style="DUID=68F290EE;NSL=0;"/>
+					<element geometry="Left=745;Top=1339;Right=835;Bottom=1409;" subject="EAID_CCACD9C3_0F25_4839_844D_DCAF96861695" seqno="48" style="DUID=800EAACC;NSL=0;"/>
+					<element geometry="Left=872;Top=1409;Right=962;Bottom=1479;" subject="EAID_B5D7CA6E_3FB4_423e_B50E_A7C6B28E280E" seqno="49" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=6E4D2EEF;"/>
+					<element geometry="Left=1048;Top=710;Right=1276;Bottom=811;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="50" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=3F40E56D;"/>
+					<element geometry="Left=1720;Top=1017;Right=1804;Bottom=1061;" subject="EAID_90D05E22_266C_43a6_B8B3_4DB83EC94A01" seqno="51" style="NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;DUID=0F029FB6;"/>
+					<element geometry="Left=1486;Top=546;Right=1576;Bottom=616;" subject="EAID_70945F18_A0FC_48fd_9284_B6F7309F5985" seqno="52" style="NSL=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="Left=1349;Top=1098;Right=1448;Bottom=1145;" subject="EAID_5C5864B8_F988_4200_95E7_ABB29EDCEDFD" seqno="53" style="BCol=-1;BFol=-1;LCol=-1;LWth=-1;NSL=0;black=0;bold=0;charset=0;fontsz=0;italic=0;pitch=0;ul=0;DUID=CEC13CC5;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A9BF00C6_6E54_43ff_B95F_F02462CDAB9B" style="Mode=3;EOID=A1942F03;SOID=19A0301C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-8;SY=3;EX=-8;EY=3;$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="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=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="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="EDGE=3;SX=20;SY=-12;EX=20;EY=-12;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=77: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_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=52086AF8;SOID=EB4BB6E9;Color=-1;LWidth=0;Hidden=1;"/>
+					<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="EX=0;EY=0;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="EDGE=1;EX=-14;EY=3;SX=-14;SY=3;$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=5;SY=3;EX=0;EY=8;$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;"/>
-					<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=1;EX=4;EY=-1;SX=4;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" style="Mode=3;EOID=C821B644;SOID=AA41C3A2;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-6;SY=-17;EX=-6;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="SX=6;SY=9;EX=-18;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" style="Mode=3;EOID=E55F47CF;SOID=1CE512C3;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_0B89904B_56C2_4154_BC18_F6B8F5B8635B" style="Mode=3;EOID=0C97029C;SOID=B0B214A7;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_6B97ADD1_0B83_48d4_9B1E_CDA9640E018F" style="Mode=3;EOID=68F290EE;SOID=36911C55;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=0;EY=0;$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=0;SY=0;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4C1CA5AA_7768_4d38_ACD6_B0600D8325F5" style="Mode=3;EOID=6E4D2EEF;SOID=C84F3FC0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=1;EX=4;EY=9;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D4380231_C68D_4ffa_94AD_A6E1847A6463" style="Mode=3;EOID=800EAACC;SOID=5BD718B3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-18;SY=-2;EX=-3;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_70DB7081_2834_461e_8B11_0F74ABE52935" style="Mode=3;EOID=FA3D02D1;SOID=BB4A93FB;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-6;SY=-18;EX=-6;EY=-18;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ACAE27B9_7F0D_4491_BDBC_A13B860A4535" style="Mode=3;EOID=0C97029C;SOID=A1942F03;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_8810653B_DB4F_443e_9499_790E7FC8DE86" style="Mode=3;EOID=0C97029C;SOID=68F290EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-5;SY=12;EX=0;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8713966E_EA7B_4ed9_8ABC_CDD0FA9EF71E" style="Mode=3;EOID=C821B644;SOID=800EAACC;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=C821B644;SOID=6E4D2EEF;Color=-1;LWidth=0;Hidden=0;"/>
 					<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;"/>
@@ -46387,11 +48670,12 @@
 					<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=0C97029C;SOID=0F029FB6;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="EDGE=1;EX=-23;EY=-35;SX=-30;SY=-14;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D2C94CC0_A14F_4c9c_B4C0_912C9C11EC4E" style="Mode=3;EOID=0C97029C;SOID=CEC13CC5;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=6;SY=9;EX=-18;EY=17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" style="Mode=3;EOID=E55F47CF;SOID=1CE512C3;Color=-1;LWidth=0;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_800B935D_1C60_427e_9BF3_BDFF0776A54C" style="Mode=3;EOID=C821B644;SOID=E5EA9B40;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=4;EY=-1;SX=4;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" style="Mode=3;EOID=C821B644;SOID=AA41C3A2;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="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5821CCD3_5B04_4ea2_ACBC_32A0FFC18B3B" style="Mode=3;EOID=FA3D02D1;SOID=92236F12;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8A01A5C1_A23D_4206_A7D0_F01F3866B78F" style="Mode=3;EOID=FA3D02D1;SOID=4C2B344C;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=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=-2;EY=-3;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="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_347122EA_7C29_4063_A1AE_AE6FDB923ADE" style="Mode=3;EOID=8B6B6E09;SOID=FE0B0D4F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$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;"/>
@@ -46399,10 +48683,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=4;SY=-3;EX=3;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=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=-2;SY=-1;EX=-2;EY=-1;$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="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="EDGE=1;EX=0;EY=0;$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=-8;SY=3;EX=-8;EY=3;$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;$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="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4" style="Mode=3;EOID=FA3D02D1;SOID=0E34371A;Color=-1;LWidth=0;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_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=8;SY=0;EX=8;EY=0;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;"/>
@@ -46413,73 +48697,79 @@
 					<element geometry="SX=-33;SY=6;EX=-33;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_33CADDC4_3A87_4925_A302_795332661BE4" style="Mode=3;EOID=A992BCE8;SOID=FD0DE1AB;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;$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=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9AF7586F_1A75_46a2_BD4B_CD5FBBA367E4" style="Mode=3;EOID=FA3D02D1;SOID=0E34371A;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$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=-6;SY=-17;EX=-6;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="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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_6B773B07_0005_44a3_9D34_B2FE839A6B37">
 				<model package="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" localID="234" owner="EAPK_92A0CFE1_0DAD_4a19_AE6F_360376AC39EC" tpos="2"/>
 				<properties name="role playing on buyer side" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-17 22:53:49" modified="2023-07-12 18:42:29"/>
+				<project author="lps" version="1.0" created="2022-01-17 22:53:49" modified="2023-09-11 16:35: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=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=6A4861F5;"/>
+				<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=E4A91592;"/>
 				<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=217;Top=85;Right=307;Bottom=120;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="1" style="DUID=53185F62;NSL=0;BCol=-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=277;Right=307;Bottom=317;" subject="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" seqno="2" style="DUID=198421EC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=10;Top=340;Right=100;Bottom=386;" subject="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" seqno="3" style="DUID=345DD65C;"/>
-					<element geometry="Left=217;Top=347;Right=307;Bottom=380;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="4" style="DUID=C51F0F97;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=410;Top=346;Right=543;Bottom=382;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="5" style="DUID=D3C6012D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=697;Top=85;Right=861;Bottom=170;" 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=D39FCBB1;"/>
-					<element geometry="Left=163;Top=514;Right=278;Bottom=569;" subject="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" 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=F0905A8A;"/>
-					<element geometry="Left=1041;Top=154;Right=1175;Bottom=187;" subject="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" seqno="8" style="AttPro=0;AttPri=0;AttPub=0;AttPkg=0;AttCustom=0;OpCustom=0;RzO=1;NSL=0;DUID=B299470C;"/>
-					<element geometry="Left=534;Top=569;Right=548;Bottom=583;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="9" style="DUID=3D8E113A;"/>
-					<element geometry="Left=368;Top=433;Right=585;Bottom=505;" 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=C59BDD18;"/>
-					<element geometry="Left=511;Top=609;Right=799;Bottom=716;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=3856D201;"/>
-					<element geometry="Left=420;Top=569;Right=434;Bottom=583;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="12" style="DUID=C74E4F71;"/>
-					<element geometry="Left=234;Top=617;Right=375;Bottom=672;" subject="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" seqno="13" style="NSL=0;DUID=46C7B2E7;"/>
-					<element geometry="Left=1054;Top=339;Right=1188;Bottom=372;" subject="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" 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;AttPro=0;AttPri=0;AttPub=0;AttPkg=0;AttCustom=0;OpCustom=0;RzO=1;DUID=DBCB097D;"/>
-					<element geometry="Left=731;Top=432;Right=856;Bottom=504;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" 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=08069179;"/>
-					<element geometry="Left=762;Top=358;Right=846;Bottom=413;" subject="EAID_48133D6A_BE44_43c9_A647_04650698EC95" 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=390DC823;"/>
-					<element geometry="Left=1034;Top=213;Right=1223;Bottom=327;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" 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=758B14DC;"/>
-					<element geometry="Left=76;Top=617;Right=216;Bottom=672;" subject="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" seqno="18" style="NSL=0;DUID=21C3F3BF;"/>
-					<element geometry="Left=391;Top=179;Right=565;Bottom=251;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" 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=37331A03;"/>
-					<element geometry="Left=681;Top=213;Right=934;Bottom=327;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" 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=96CA93FC;"/>
-					<element geometry="EX=0;EY=3;SX=-46;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=747:-361$;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=D3C6012D;SOID=08069179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=158;Top=22;Right=367;Bottom=149;" subject="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" seqno="1" style="DUID=3253327D;NSL=0;BCol=-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=180;Right=208;Bottom=250;" subject="EAID_17662AEF_1321_446a_AE42_0583F7417A79" seqno="2" style="DUID=3FB5C56F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=433;Top=68;Right=523;Bottom=103;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" seqno="3" style="DUID=53185F62;NSL=0;BCol=-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=277;Right=307;Bottom=317;" subject="EAID_38D56231_3585_4b9a_AA7B_311BB94C2896" seqno="4" style="DUID=198421EC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=10;Top=340;Right=100;Bottom=386;" subject="EAID_5466880A_1E58_432c_BA75_7B4EA81152C8" seqno="5" style="DUID=345DD65C;"/>
+					<element geometry="Left=217;Top=347;Right=307;Bottom=380;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="6" style="DUID=C51F0F97;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=410;Top=346;Right=543;Bottom=382;" subject="EAID_BCFFD008_5189_4d53_B61A_99942ED53255" seqno="7" style="DUID=D3C6012D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=697;Top=56;Right=861;Bottom=141;" subject="EAID_E84B97D8_2656_498d_B584_D95C2DBBD7A1" 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=D39FCBB1;"/>
+					<element geometry="Left=163;Top=514;Right=278;Bottom=569;" subject="EAID_C84E9D56_7412_4d8e_9A5C_0F684174C4AC" 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=F0905A8A;"/>
+					<element geometry="Left=1041;Top=154;Right=1175;Bottom=187;" subject="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" seqno="10" style="AttPro=0;AttPri=0;AttPub=0;AttPkg=0;AttCustom=0;OpCustom=0;RzO=1;NSL=0;DUID=B299470C;"/>
+					<element geometry="Left=534;Top=569;Right=548;Bottom=583;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="11" style="DUID=3D8E113A;"/>
+					<element geometry="Left=368;Top=433;Right=585;Bottom=505;" 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=C59BDD18;"/>
+					<element geometry="Left=511;Top=609;Right=799;Bottom=716;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=3856D201;"/>
+					<element geometry="Left=420;Top=569;Right=434;Bottom=583;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="14" style="DUID=C74E4F71;"/>
+					<element geometry="Left=234;Top=617;Right=375;Bottom=672;" subject="EAID_620C5C3F_3C72_4897_A377_32156A5461E3" seqno="15" style="NSL=0;DUID=46C7B2E7;"/>
+					<element geometry="Left=1054;Top=339;Right=1188;Bottom=372;" subject="EAID_5FC03FB6_FD84_4bb6_988F_5C88024446CE" 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;AttPro=0;AttPri=0;AttPub=0;AttPkg=0;AttCustom=0;OpCustom=0;RzO=1;DUID=DBCB097D;"/>
+					<element geometry="Left=731;Top=432;Right=856;Bottom=504;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" 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=08069179;"/>
+					<element geometry="Left=762;Top=358;Right=846;Bottom=413;" subject="EAID_48133D6A_BE44_43c9_A647_04650698EC95" 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=390DC823;"/>
+					<element geometry="Left=1034;Top=213;Right=1223;Bottom=327;" subject="EAID_45AEC7A4_33A9_4a71_B083_E051F46A909D" 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=758B14DC;"/>
+					<element geometry="Left=76;Top=617;Right=216;Bottom=672;" subject="EAID_23AE06F7_776F_4c3b_ACE5_A42B2D392823" seqno="20" style="NSL=0;DUID=21C3F3BF;"/>
+					<element geometry="Left=391;Top=179;Right=565;Bottom=251;" subject="EAID_11324BBB_3386_4c18_A12E_00C2BE16F4B6" 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=37331A03;"/>
+					<element geometry="Left=681;Top=213;Right=934;Bottom=327;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" 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=96CA93FC;"/>
+					<element geometry="EDGE=1;SX=4;SY=0;EX=0;EY=16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=224:-453$;" subject="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" style="Mode=3;EOID=C59BDD18;SOID=F0905A8A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=-8;EX=5;EY=1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=51: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=2: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=96CA93FC;SOID=758B14DC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=29;EX=0;EY=28;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=73: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=1: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=96CA93FC;SOID=758B14DC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-87;SY=-36;EX=0;EY=-38;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_881F7772_9A6C_4e5a_BB86_A2E25524B058" style="Mode=3;EOID=96CA93FC;SOID=758B14DC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$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_AB476D87_C25E_439e_AA92_BB00BFD1DB22" style="Mode=3;EOID=37331A03;SOID=3FB5C56F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F365A241_4CD0_4009_A42F_041D198E70E4" style="Mode=3;EOID=3856D201;SOID=3FB5C56F;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F79A58B0_3229_4f09_A0DE_6D0C5CD5A716" style="Mode=3;EOID=53185F62;SOID=3253327D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=7;SY=0;EX=0;EY=-23;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=341:-476$;" subject="EAID_B5765A72_4D1D_47a0_A514_24983E4F5D47" style="Mode=1;EOID=F0905A8A;SOID=21C3F3BF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-9;SY=1;EX=29;EY=-26;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD823F50_7A3D_4832_8C19_876392639DF8" style="Mode=1;EOID=F0905A8A;SOID=46C7B2E7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=11;EY=1;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BD5C98D5_43D4_41be_9C21_84470056CF01" style="Mode=3;EOID=D3C6012D;SOID=C59BDD18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-10;SY=-28;EX=-3;EY=-24;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143: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=-12:OY=4: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=08069179;SOID=C59BDD18;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=1;EDGE=1;SX=1;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_19AD8C15_4D9D_48f2_A3E1_A997E86942D2" style="Mode=3;EOID=D39FCBB1;SOID=96CA93FC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=63;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=-4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-19:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=866:-357$;" subject="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825" style="Mode=3;EOID=DBCB097D;SOID=96CA93FC;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=652;SCTR.TOP=-235;SCTR.RIGHT=717;SCTR.BOTTOM=-188;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=50:OY=-47:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=717:-213$717:-188$652:-188$652:-235$681:-235$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=96CA93FC;SOID=96CA93FC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=1;SY=1;EX=-1;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_93385F64_990A_44d0_A266_DDF9F55EABCE" style="Mode=3;EOID=37331A03;SOID=D3C6012D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=62;SY=0;EX=0;EY=-3;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=865:-173$;" subject="EAID_15FE118D_5443_4723_8887_BFF48DC77200" style="Mode=3;EOID=B299470C;SOID=96CA93FC;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=37331A03;SOID=D3C6012D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=-12;EDGE=1;$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=478:-139$;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=D39FCBB1;SOID=37331A03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-15;SY=0;EX=0;EY=31;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" style="Mode=3;EOID=D39FCBB1;SOID=53185F62;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=-3;EX=4;EY=10;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_24AB8D4E_3151_4d4e_B951_BAA8F8436033" style="Mode=3;EOID=D39FCBB1;SOID=53185F62;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-6;SY=0;EX=0;EY=-30;EDGE=1;$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=472:-128$;" subject="EAID_1B9200E2_D732_4a5e_BCE2_05E832F758D6" style="Mode=3;EOID=D39FCBB1;SOID=37331A03;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=3;SX=-46;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=747:-361$;" subject="EAID_657CE8BE_2717_41d1_B80A_3B15D5AAC373" style="Mode=3;EOID=D3C6012D;SOID=08069179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-27;SY=16;EX=0;EY=31;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=12: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=C59BDD18;SOID=08069179;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=-49;EY=0;SX=0;SY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=48:OY=18: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=427:-671$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=C59BDD18;SOID=3856D201;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-2;EX=28;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=27:OX=128: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=821:-664$;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=08069179;SOID=3856D201;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=28;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=189:CY=14:OX=100: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=821:-664$;" subject="EAID_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=08069179;SOID=3856D201;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-114;SY=0;EX=65;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117:CY=14:OX=68: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_D01E7677_5AC2_42b1_AA17_2A8EC003CCFE" style="Mode=3;EOID=C59BDD18;SOID=3856D201;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=3;EX=1;EY=3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_84F5E9DD_96DE_4ca7_8CA6_9C68826B377B" style="Mode=3;EOID=C74E4F71;SOID=3D8E113A;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-14;SY=-2;EX=18;EY=-32;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FBFC1FF3_5808_4318_94FE_368AE6509420" style="Mode=3;EOID=96CA93FC;SOID=390DC823;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_77537835_B6A8_4c58_8AA2_734EB60E8CFB" style="Mode=3;EOID=D3C6012D;SOID=C51F0F97;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-3;SY=-3;EX=-3;EY=-2;EDGE=4;$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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_70BE7952_3EF2_47d7_9AF0_B6AC86597613" style="Mode=3;EOID=345DD65C;SOID=C51F0F97;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=40: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_E3D7352D_80E6_41e6_B85A_672AACE795E2" style="Mode=3;EOID=53185F62;SOID=198421EC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;EX=0;EY=0;SX=0;SY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=476:-296$;" subject="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" style="Mode=3;EOID=D3C6012D;SOID=198421EC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=4;SY=0;EX=0;EY=16;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=224:-453$;" subject="EAID_F705DF6C_1870_4735_8ACE_0CBB68152882" style="Mode=3;EOID=C59BDD18;SOID=F0905A8A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=61:CY=14:OX=40: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_E3D7352D_80E6_41e6_B85A_672AACE795E2" style="Mode=3;EOID=3253327D;SOID=198421EC;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;EX=-35;EY=0;SX=0;SY=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=441:-295$;" subject="EAID_40DE5B33_7251_4616_AC39_5B5D4DC0AF5F" style="Mode=3;EOID=D3C6012D;SOID=198421EC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=63;SY=0;EX=0;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=102:CY=14:OX=-4:OY=-1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-19:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=866:-357$;" subject="EAID_D8B16DE0_0613_42f0_811D_F82085D6A825" style="Mode=3;EOID=DBCB097D;SOID=96CA93FC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<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-07-12 18:42:43"/>
+				<project author="lps" version="1.0" created="2022-01-17 23:06:42" modified="2023-09-11 16:38: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=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=F7B72091;"/>
+				<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;"/>
 				<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/>
@@ -46500,6 +48790,7 @@
 					<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=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="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;"/>
 					<element geometry="EDGE=1;SX=-4;SY=1;EX=-3;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4657FAEB_1A34_4ef7_947D_E6C47AAC7527" style="Mode=3;EOID=A30B8AE0;SOID=B3CA9ED7;Color=-1;LWidth=0;Hidden=0;"/>
@@ -46507,7 +48798,7 @@
 					<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=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=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=;" subject="EAID_BBA3014F_919D_4de3_BCF2_6CA4F71150CA" style="Mode=3;EOID=1545CE73;SOID=5D621877;Color=-1;LWidth=0;Hidden=1;"/>
+					<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="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;"/>
@@ -46539,9 +48830,9 @@
 			<diagram xmi:id="EAID_347C0768_29F9_4a87_9AF3_4E11E314BE26">
 				<model package="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29" localID="236" owner="EAPK_833D84AE_B33B_4d47_8747_E1E072866B29"/>
 				<properties name="location" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-18 11:37:57" modified="2023-07-12 18:43:30"/>
+				<project author="lps" version="1.0" created="2022-01-18 11:37:57" modified="2023-09-11 16:40:53"/>
 				<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=41BF482F;"/>
+				<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=A5C661DC;"/>
 				<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/>
@@ -46550,9 +48841,9 @@
 					<element geometry="Left=752;Top=105;Right=959;Bottom=193;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="2" style="DUID=95BAF6A8;NSL=0;BCol=-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=447;Right=646;Bottom=507;" subject="EAID_D268976D_01C8_454f_ABBB_CBDD98065B7F" seqno="3" style="DUID=CE21DE7C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=553;Top=272;Right=643;Bottom=332;" subject="EAID_BECC36B3_D7D3_4161_8FE5_C4EE73295C40" seqno="4" style="DUID=821C50F7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1149;Top=193;Right=1372;Bottom=278;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="5" style="DUID=8AC52DD7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1139;Top=193;Right=1362;Bottom=291;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="5" style="DUID=8AC52DD7;NSL=0;BCol=-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=526;Right=496;Bottom=754;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="6" style="DUID=F4C4B0AC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1167;Top=559;Right=1364;Bottom=700;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" seqno="7" style="DUID=9C119677;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1167;Top=544;Right=1364;Bottom=685;" subject="EAID_33E9269C_0B96_4b38_A129_C30771A9833F" seqno="7" style="DUID=9C119677;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=754;Top=317;Right=956;Bottom=470;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="8" style="DUID=65078BF1;NSL=0;BCol=-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=229;Right=421;Bottom=299;" subject="EAID_2424C22E_B54F_4b6f_BA47_E78DE21C76DE" seqno="9" style="DUID=E376BF90;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=751;Top=637;Right=960;Bottom=800;" subject="EAID_0549BA10_DC2D_4188_B54C_B6CDF1726225" seqno="10" style="DUID=2CE94661;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -46567,12 +48858,13 @@
 					<element geometry="EDGE=1;$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=;" subject="EAID_C6F7D14A_11BF_430e_ABED_4C9AC22FFF2A" style="Mode=3;EOID=95BAF6A8;SOID=65078BF1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76: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=;" subject="EAID_626183B8_93AC_4300_B227_85988E5F2016" style="Mode=3;EOID=821C50F7;SOID=65078BF1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=27;SY=-9;EX=27;EY=-9;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66:CY=27: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=5:OY=-5: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=CE21DE7C;SOID=65078BF1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-3;SY=-1;EX=-3;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49: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=65078BF1;SOID=9C119677;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=26;SY=32;EX=26;EY=41;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85:CY=27:OX=-16: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_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=65078BF1;SOID=8AC52DD7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-2;SY=11;EX=-2;EY=11;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49:CY=14:OX=21:OY=39:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=22:OY=-8: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=65078BF1;SOID=9C119677;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=26;SY=32;EX=26;EY=41;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=17: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_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=65078BF1;SOID=8AC52DD7;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-3;EX=-4;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=64:OY=50:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-34:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=597:-721$;" subject="EAID_7E6F9511_A2DD_4f1c_B8AA_9EA312803C2B" style="Mode=3;EOID=CE21DE7C;SOID=2CE94661;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-1;SY=-34;EX=0;EY=-35;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=67: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=9C119677;SOID=947783C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=8;SY=36;EX=8;EY=36;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90: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_6A50E4FC_E8DA_47c5_AD39_5BA2A66950B9" style="Mode=3;EOID=65078BF1;SOID=947783C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=14;SY=4;EX=81;EY=4;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=49: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_9F23612C_1865_4c8b_82ED_0BAA7D433501" style="Mode=3;EOID=65078BF1;SOID=947783C0;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=1389;SCTR.TOP=-428;SCTR.RIGHT=1425;SCTR.BOTTOM=-394;$LLB=;LLT=;LMT=;LMB=;LRT=CX=115:CY=14:OX=124:OY=31:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1392:-428$1425:-428$1425:-394$1392:-394$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=947783C0;SOID=947783C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=125;SY=0;EX=0;EY=27;$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=1390:-122$;" subject="EAID_0557F338_A3A5_457d_AE66_986280A7B2F6" style="Mode=3;EOID=95BAF6A8;SOID=947783C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=113;SY=0;EX=0;EY=-12;$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=1378:-161$;" subject="EAID_E7ABB55C_F52F_4373_8164_044CE03A05CB" style="Mode=3;EOID=95BAF6A8;SOID=947783C0;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-49;EX=0;EY=-28;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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=139:-767$139:-422$;" subject="EAID_5F5EE792_E682_4cf4_B67B_A6B270F34AEA" style="Mode=3;EOID=BEFEC41A;SOID=2CE94661;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -46585,26 +48877,26 @@
 			<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-07-13 06:47:12"/>
+				<project author="andreea" version="1.0" created="2021-12-21 13:26:10" modified="2023-09-11 16:59: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=B0E89F0B;"/>
+				<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;"/>
 				<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=823;Top=466;Right=1079;Bottom=541;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="1" style="DUID=7A75ACBB;NSL=0;"/>
+					<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=220;Top=707;Right=333;Bottom=759;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="7" style="DUID=D8A45F9D;"/>
+					<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=85;Top=598;Right=346;Bottom=696;" 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=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=557;Right=1255;Bottom=772;" 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=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;"/>
@@ -46614,153 +48906,164 @@
 					<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=92;SY=3;EX=-20;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="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="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="SX=-6;SY=-22;EX=-6;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="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=21;SY=4;EX=21;EY=4;$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=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;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_E7B9DC27_DFB5_40f5_AFF2_F34912D5FC0D">
 				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" localID="167" owner="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="4"/>
 				<properties name="terms relations" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-21 13:27:58" modified="2023-07-12 18:59:57"/>
+				<project author="andreea" version="1.0" created="2021-12-21 13:27:58" modified="2023-09-11 17:08: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=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=3FF84F83;"/>
+				<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=BF542A55;"/>
 				<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=1172;Top=564;Right=1388;Bottom=634;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="1" style="DUID=3B26A01F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=848;Top=28;Right=963;Bottom=155;" subject="EAID_00596D9E_5B53_4be3_BC1E_CEFA76106847" seqno="2" style="DUID=34F9FB14;"/>
-					<element geometry="Left=972;Top=312;Right=986;Bottom=326;" subject="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" seqno="3" style="DUID=838E8F34;"/>
-					<element geometry="Left=933;Top=724;Right=947;Bottom=738;" subject="EAID_75629D1B_E406_4b38_82BA_5525819A470C" seqno="4" style="DUID=BEEB13C7;"/>
-					<element geometry="Left=972;Top=312;Right=986;Bottom=326;" subject="EAID_1B056616_B822_4add_84D3_1D36186827ED" seqno="5" style="DUID=5A111517;"/>
-					<element geometry="Left=484;Top=481;Right=498;Bottom=495;" subject="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" seqno="6" style="DUID=F65730AD;"/>
-					<element geometry="Left=1309;Top=706;Right=1460;Bottom=776;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="7" style="DUID=02414B90;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=554;Top=414;Right=841;Bottom=564;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="8" style="DUID=BED48CD9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=582;Top=228;Right=814;Bottom=365;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="9" style="DUID=BF468981;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=628;Top=855;Right=889;Bottom=953;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="10" style="DUID=563832C5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1263;Top=952;Right=1577;Bottom=1167;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="11" style="DUID=A483BF3C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=804;Top=997;Right=1119;Bottom=1121;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="12" style="DUID=A10655D7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=572;Top=626;Right=822;Bottom=776;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="13" style="DUID=624DAE59;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1065;Top=285;Right=1155;Bottom=355;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="14" style="DUID=EC189DFF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=235;Top=453;Right=358;Bottom=524;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=20BA128A;"/>
-					<element geometry="Left=342;Top=869;Right=520;Bottom=939;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" seqno="16" style="DUID=13EAD3F6;NSL=0;BCol=-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=687;Right=1181;Bottom=757;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" 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=C006AE32;"/>
-					<element geometry="Left=201;Top=666;Right=392;Bottom=736;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" seqno="18" style="DUID=72F5D496;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=329;Top=262;Right=439;Bottom=332;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="19" style="DUID=285148B7;"/>
-					<element geometry="Left=1138;Top=455;Right=1420;Bottom=525;" subject="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" seqno="20" style="DUID=2B749872;"/>
-					<element geometry="SX=-2;SY=-4;EX=-2;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9512B0DA_565A_4051_A589_525053877046" style="Mode=3;EOID=838E8F34;SOID=BEEB13C7;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="Left=1175;Top=395;Right=1391;Bottom=465;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="1" style="DUID=3B26A01F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=976;Top=151;Right=990;Bottom=165;" subject="EAID_F0EE8667_674A_4286_AEE4_319B6DD14F24" seqno="2" style="DUID=838E8F34;"/>
+					<element geometry="Left=937;Top=563;Right=951;Bottom=577;" subject="EAID_75629D1B_E406_4b38_82BA_5525819A470C" seqno="3" style="DUID=BEEB13C7;"/>
+					<element geometry="Left=976;Top=151;Right=990;Bottom=165;" subject="EAID_1B056616_B822_4add_84D3_1D36186827ED" seqno="4" style="DUID=5A111517;"/>
+					<element geometry="Left=511;Top=320;Right=525;Bottom=334;" subject="EAID_9776729F_9284_46c1_AB77_BA5692ADE213" seqno="5" style="DUID=F65730AD;"/>
+					<element geometry="Left=1313;Top=545;Right=1464;Bottom=615;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="6" style="DUID=02414B90;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=558;Top=253;Right=845;Bottom=403;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="7" style="DUID=BED48CD9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=586;Top=67;Right=818;Bottom=204;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="8" style="DUID=BF468981;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=632;Top=669;Right=893;Bottom=767;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="9" style="DUID=563832C5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1267;Top=791;Right=1581;Bottom=1006;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="10" style="DUID=A483BF3C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=808;Top=836;Right=1123;Bottom=960;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="11" style="DUID=A10655D7;NSL=0;BCol=-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=465;Right=826;Bottom=615;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="12" style="DUID=624DAE59;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1069;Top=124;Right=1159;Bottom=194;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="13" style="DUID=EC189DFF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=239;Top=292;Right=362;Bottom=363;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=20BA128A;"/>
+					<element geometry="Left=348;Top=696;Right=526;Bottom=766;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" seqno="15" style="DUID=13EAD3F6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1062;Top=526;Right=1185;Bottom=596;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" 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=C006AE32;"/>
+					<element geometry="Left=205;Top=505;Right=396;Bottom=575;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" seqno="17" style="DUID=72F5D496;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=333;Top=101;Right=443;Bottom=171;" subject="EAID_E6781D26_CD82_4c7b_A53A_502157F5F45A" seqno="18" style="DUID=285148B7;"/>
+					<element geometry="Left=1142;Top=294;Right=1424;Bottom=364;" subject="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" seqno="19" style="DUID=2B749872;"/>
+					<element geometry="SX=-7;SY=0;EX=-7;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" style="Mode=3;EOID=5A111517;SOID=F65730AD;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=1;SX=9;SY=-9;EX=34;EY=-27;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=02414B90;SOID=A483BF3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=14;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=20BA128A;SOID=72F5D496;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=71;SY=0;EX=0;EY=-52;$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=367:-541$;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=BED48CD9;SOID=72F5D496;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=71;SY=0;EX=0;EY=-52;$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=371:-380$;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=BED48CD9;SOID=72F5D496;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;EX=-124;EY=-20;SX=2;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=-14:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-3:OY=8:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_34156914_725C_4a26_B380_6FDE59360DAF" style="Mode=3;EOID=624DAE59;SOID=72F5D496;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=62;EX=0;EY=-53;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=916:-639$916:-349$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=BF468981;SOID=624DAE59;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=62;EX=0;EY=-53;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=920:-478$920:-188$;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=BF468981;SOID=624DAE59;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-4;SY=33;EX=-4;EY=-19;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=C006AE32;SOID=624DAE59;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-123;SY=0;EX=23;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72: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=;" subject="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E" style="Mode=3;EOID=13EAD3F6;SOID=563832C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=2;SX=0;SY=-4;EX=-2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1117:-908$;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=C006AE32;SOID=563832C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=45;SY=0;EX=-13;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1006:-935$1371:-935$;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=02414B90;SOID=A10655D7;Color=-1;LWidth=0;TREE=OR;Hidden=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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=BF468981;SOID=285148B7;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=43;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=188:-675$188:-329$;" subject="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" style="Mode=3;EOID=20BA128A;SOID=563832C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;SX=0;SY=-4;EX=-2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1121:-722$;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=C006AE32;SOID=563832C5;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=45;SY=0;EX=-13;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1010:-774$1375:-774$;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=02414B90;SOID=A10655D7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=0;SY=-6;EX=0;EY=62;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=11: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_F593B546_502A_413a_8694_914903478877" style="Mode=3;EOID=A10655D7;SOID=A483BF3C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-7;SY=0;EX=-7;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EF2C4645_6C41_4c39_9F95_185806E2B6E1" style="Mode=3;EOID=5A111517;SOID=F65730AD;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="EX=0;EY=-2;SX=0;SY=51;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=59: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=1595:-245$1595:-743$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=02414B90;SOID=BF468981;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=29;SX=-55;SY=0;EDGE=3;$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=1225:-672$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=624DAE59;SOID=3B26A01F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=34;SY=0;EX=0;EY=-22;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1317:-181$;" subject="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" style="Mode=3;EOID=EC189DFF;SOID=2B749872;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-2;SX=0;SY=51;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142:CY=14:OX=59: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=1599:-84$1599:-582$;" subject="EAID_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=02414B90;SOID=BF468981;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=-4;EX=-2;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_9512B0DA_565A_4051_A589_525053877046" style="Mode=3;EOID=838E8F34;SOID=BEEB13C7;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=0;EY=29;SX=-55;SY=0;EDGE=3;$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=1228:-511$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=624DAE59;SOID=3B26A01F;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=53: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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" style="Mode=3;EOID=02414B90;SOID=3B26A01F;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_A521BACC_3593_49bc_AB31_246F04F34435" style="Mode=3;EOID=EC189DFF;SOID=34F9FB14;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_D957499E_9DCB_46c9_BF9D_2D348A5961B1" style="Mode=3;EOID=BF468981;SOID=34F9FB14;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-43;SY=4;EX=9;EY=4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" style="Mode=3;EOID=EC189DFF;SOID=C006AE32;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=4;SY=0;EX=-1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=300:-198$1109:-198$;" subject="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" style="Mode=3;EOID=EC189DFF;SOID=20BA128A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=4;SY=0;EX=-1;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=304:-49$1113:-49$;" subject="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" style="Mode=3;EOID=EC189DFF;SOID=20BA128A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=BF468981;SOID=BED48CD9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;$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=20BA128A;SOID=BED48CD9;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=624DAE59;SOID=BED48CD9;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=45;SY=0;EX=0;EY=11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1429:-309$;" subject="EAID_285BF543_AB60_4346_9E70_090B7DE95623" style="Mode=3;EOID=EC189DFF;SOID=02414B90;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=45;SY=0;EX=0;EY=11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1433:-148$;" subject="EAID_285BF543_AB60_4346_9E70_090B7DE95623" style="Mode=3;EOID=EC189DFF;SOID=02414B90;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-41;SY=3;EX=-2;EY=-2;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_818697AF_821C_40da_B5DE_D7ED82169378" style="Mode=3;EOID=EC189DFF;SOID=BF468981;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=34;SY=0;EX=0;EY=-22;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1313:-342$;" subject="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" style="Mode=3;EOID=EC189DFF;SOID=2B749872;Color=-1;LWidth=0;TREE=OR;Hidden=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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=BF468981;SOID=285148B7;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_D15C967A_82A2_41fa_B64B_40399AE94FF0">
 				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" localID="168" owner="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="2"/>
 				<properties name="procedure terms hierarchy" type="Logical"/>
-				<project author="andreea" version="1.0" created="2021-12-21 13:52:49" modified="2023-07-12 18:52:31"/>
+				<project author="andreea" version="1.0" created="2021-12-21 13:52:49" modified="2023-09-11 16:51: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=FA3122F3;"/>
+				<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=81DB8342;"/>
 				<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=332;Top=426;Right=655;Bottom=524;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" 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=62617837;"/>
-					<element geometry="Left=955;Top=367;Right=1285;Bottom=582;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="2" style="DUID=116CC1B6;NSL=0;BCol=-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=413;Right=933;Bottom=537;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="3" style="DUID=2A38416E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=976;Top=108;Right=1263;Bottom=287;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" 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=1A8DC2BE;"/>
-					<element geometry="Left=74;Top=139;Right=352;Bottom=256;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=EEEA8041;"/>
-					<element geometry="Left=553;Top=163;Right=655;Bottom=233;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="6" style="DUID=84EEFC62;NSL=0;BCol=-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=440;Right=309;Bottom=510;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" 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=F9DCBDC0;"/>
+					<element geometry="Left=821;Top=15;Right=1077;Bottom=100;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="1" style="DUID=E17EF297;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=492;Top=23;Right=715;Bottom=108;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="2" style="DUID=D30516AA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=82;Top=2;Right=343;Bottom=113;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="3" style="DUID=ABA486B5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=332;Top=426;Right=655;Bottom=524;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" 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=62617837;"/>
+					<element geometry="Left=955;Top=322;Right=1285;Bottom=537;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="5" style="DUID=116CC1B6;NSL=0;BCol=-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=413;Right=933;Bottom=537;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" seqno="6" style="DUID=2A38416E;NSL=0;BCol=-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=119;Right=1264;Bottom=276;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" 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=1A8DC2BE;"/>
+					<element geometry="Left=74;Top=139;Right=352;Bottom=256;" 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;DUID=EEEA8041;"/>
+					<element geometry="Left=552;Top=163;Right=654;Bottom=233;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="9" style="DUID=84EEFC62;NSL=0;BCol=-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=440;Right=309;Bottom=510;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" 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=F9DCBDC0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A" style="Mode=3;EOID=84EEFC62;SOID=E17EF297;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" style="Mode=3;EOID=84EEFC62;SOID=D30516AA;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" style="Mode=3;EOID=84EEFC62;SOID=ABA486B5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-4;SY=-8;EX=-4;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" style="Mode=3;EOID=84EEFC62;SOID=62617837;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-138;SY=75;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" style="Mode=3;EOID=84EEFC62;SOID=116CC1B6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=54;SY=14;EX=5;EY=-32;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=84EEFC62;SOID=2A38416E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131:CY=14:OX=72: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_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=EEEA8041;SOID=F9DCBDC0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=46;SY=34;EX=-49;EY=-35;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=84EEFC62;SOID=F9DCBDC0;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_4C36EE86_0569_4453_9E13_5EC63FC08031" style="Mode=3;EOID=84EEFC62;SOID=1A8DC2BE;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=9;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=27:OX=19: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_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=84EEFC62;SOID=EEEA8041;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=9;EX=0;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=-20: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=84EEFC62;SOID=EEEA8041;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_EED57D8A_C481_4411_A6B7_122C23812ACA">
 				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" localID="242" owner="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" tpos="1"/>
 				<properties name="terms full hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-20 11:29:12" modified="2023-07-12 18:59:40"/>
+				<project author="lps" version="1.0" created="2022-01-20 11:29:12" modified="2023-09-11 16:45: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=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=1EBBBF18;"/>
+				<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=775B6450;"/>
 				<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=425;Top=1076;Right=720;Bottom=1177;" subject="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" seqno="1" style="DUID=F612BFF5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=685;Top=1002;Right=836;Bottom=1036;" subject="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" seqno="2" style="DUID=3CF9151B;NSL=0;BCol=-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=452;Right=290;Bottom=522;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="3" style="DUID=3A9935BA;NSL=0;BCol=-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=778;Right=1016;Bottom=823;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="4" style="DUID=8447973B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=439;Top=308;Right=721;Bottom=378;" subject="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" seqno="5" style="DUID=CDE60194;NSL=0;"/>
-					<element geometry="Left=1202;Top=883;Right=1502;Bottom=958;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" 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=99774DFD;"/>
-					<element geometry="Left=1502;Top=241;Right=1647;Bottom=297;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="7" style="DUID=6FDEBD0A;"/>
-					<element geometry="Left=206;Top=554;Right=440;Bottom=629;" subject="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" 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=9D28AB25;"/>
-					<element geometry="Left=1699;Top=692;Right=1986;Bottom=871;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" 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=84033B43;"/>
-					<element geometry="Left=343;Top=801;Right=566;Bottom=876;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" 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=1B7B8584;"/>
-					<element geometry="Left=1529;Top=876;Right=1793;Bottom=964;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" 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=667FB58C;"/>
-					<element geometry="Left=266;Top=664;Right=527;Bottom=752;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" 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=F5980C00;"/>
-					<element geometry="Left=1799;Top=210;Right=2113;Bottom=415;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" 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=B9085702;"/>
-					<element geometry="Left=316;Top=910;Right=619;Bottom=1037;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" 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=114798C0;"/>
-					<element geometry="Left=854;Top=871;Right=1184;Bottom=1076;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" 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=CCDBC4EC;"/>
-					<element geometry="Left=1798;Top=452;Right=2113;Bottom=566;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" 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=AD8D8418;"/>
-					<element geometry="Left=1170;Top=92;Right=1286;Bottom=144;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="17" style="DUID=CEE9369E;NSL=0;"/>
-					<element geometry="Left=1292;Top=335;Right=1437;Bottom=391;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="18" style="DUID=912C17E4;"/>
-					<element geometry="Left=721;Top=796;Right=836;Bottom=838;" subject="EAID_0C735489_15DC_40a7_A94E_A9202738B188" 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=C9753B56;"/>
-					<element geometry="Left=1002;Top=321;Right=1185;Bottom=377;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="20" style="DUID=25B7B193;"/>
-					<element geometry="Left=1757;Top=615;Right=1948;Bottom=664;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" 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=27814F2F;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=25B7B193;SOID=F5980C00;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=184;Top=574;Right=440;Bottom=644;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="1" style="DUID=02372E97;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1427;Top=47;Right=1542;Bottom=157;" subject="EAID_D67F46E0_2B15_4614_A170_F1414A602530" seqno="2" style="DUID=AEAE27EE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=425;Top=1076;Right=720;Bottom=1177;" subject="EAID_C932A7D1_D54B_40f1_92A7_459C07235810" seqno="3" style="DUID=F612BFF5;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=685;Top=1002;Right=836;Bottom=1036;" subject="EAID_C7B390E7_9D78_49dc_8846_DAF686401728" seqno="4" style="DUID=3CF9151B;NSL=0;BCol=-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=383;Right=300;Bottom=453;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="5" style="DUID=3A9935BA;NSL=0;BCol=-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=778;Right=1016;Bottom=823;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="6" style="DUID=8447973B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=440;Top=273;Right=722;Bottom=343;" subject="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" seqno="7" style="DUID=CDE60194;NSL=0;"/>
+					<element geometry="Left=1202;Top=883;Right=1502;Bottom=958;" subject="EAID_FA070646_D88B_493f_96AB_8417E2069155" 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=99774DFD;"/>
+					<element geometry="Left=1502;Top=241;Right=1647;Bottom=297;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="9" style="DUID=6FDEBD0A;"/>
+					<element geometry="Left=167;Top=479;Right=401;Bottom=554;" subject="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" 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=9D28AB25;"/>
+					<element geometry="Left=1699;Top=692;Right=1986;Bottom=871;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" 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=84033B43;"/>
+					<element geometry="Left=343;Top=801;Right=566;Bottom=876;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" 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=1B7B8584;"/>
+					<element geometry="Left=1529;Top=876;Right=1793;Bottom=964;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" 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=667FB58C;"/>
+					<element geometry="Left=266;Top=664;Right=527;Bottom=765;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" 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=F5980C00;"/>
+					<element geometry="Left=1799;Top=210;Right=2113;Bottom=415;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" 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=B9085702;"/>
+					<element geometry="Left=316;Top=910;Right=619;Bottom=1037;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" 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=114798C0;"/>
+					<element geometry="Left=854;Top=871;Right=1184;Bottom=1076;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" 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=CCDBC4EC;"/>
+					<element geometry="Left=1798;Top=452;Right=2113;Bottom=566;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" 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=AD8D8418;"/>
+					<element geometry="Left=1170;Top=92;Right=1286;Bottom=144;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="19" style="DUID=CEE9369E;NSL=0;"/>
+					<element geometry="Left=1292;Top=335;Right=1437;Bottom=391;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="20" style="DUID=912C17E4;"/>
+					<element geometry="Left=721;Top=796;Right=836;Bottom=838;" subject="EAID_0C735489_15DC_40a7_A94E_A9202738B188" 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=C9753B56;"/>
+					<element geometry="Left=1002;Top=314;Right=1185;Bottom=370;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="22" style="DUID=25B7B193;"/>
+					<element geometry="Left=1757;Top=615;Right=1948;Bottom=664;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" 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=27814F2F;"/>
+					<element geometry="EDGE=4;SX=-2;SY=4;EX=-1;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=6FDEBD0A;SOID=B9085702;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=25B7B193;SOID=3A9935BA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" style="Mode=3;EOID=CEE9369E;SOID=CDE60194;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_02B5CE74_9A08_4893_BAE1_E10B6A40FB7A" style="Mode=3;EOID=C9753B56;SOID=3CF9151B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8AEE25AF_1FE7_48a6_84D6_B7AEDF8DCACA" style="Mode=3;EOID=C9753B56;SOID=F612BFF5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" style="Mode=3;EOID=912C17E4;SOID=AEAE27EE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B3295353_448F_433c_921A_A4E96D0B2738" style="Mode=3;EOID=25B7B193;SOID=02372E97;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_C7F7FABE_11B6_42f1_8310_BCB1832C647A" style="Mode=3;EOID=912C17E4;SOID=02372E97;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=38;SY=-13;EX=38;EY=-15;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=912C17E4;SOID=27814F2F;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-11;SY=-2;EX=-19;EY=-28;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A33B86A9_4703_4a67_8335_7F9768E9C57B" style="Mode=3;EOID=25B7B193;SOID=C9753B56;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-157;SY=44;EX=0;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=6FDEBD0A;SOID=AD8D8418;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=76;SY=101;EX=-5;EY=-5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" style="Mode=3;EOID=912C17E4;SOID=CCDBC4EC;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=46;SY=102;EX=-5;EY=-23;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8DB5DB8D_4E96_4679_A104_F62859765981" style="Mode=3;EOID=25B7B193;SOID=CCDBC4EC;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=120;SY=54;EX=-35;EY=-28;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=25B7B193;SOID=114798C0;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" style="Mode=3;EOID=25B7B193;SOID=8447973B;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;SX=-2;SY=4;EX=-1;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=6FDEBD0A;SOID=B9085702;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=AD8D8418;SOID=B9085702;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_285BF543_AB60_4346_9E70_090B7DE95623" style="Mode=3;EOID=CEE9369E;SOID=6FDEBD0A;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=6;SY=-4;EX=6;EY=-4;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" style="Mode=3;EOID=912C17E4;SOID=F5980C00;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=25B7B193;SOID=F5980C00;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" style="Mode=3;EOID=25B7B193;SOID=667FB58C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" style="Mode=3;EOID=912C17E4;SOID=667FB58C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" style="Mode=3;EOID=25B7B193;SOID=1B7B8584;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=4;SY=-6;EX=4;EY=-6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" style="Mode=3;EOID=912C17E4;SOID=1B7B8584;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=13;SY=-11;EX=13;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" style="Mode=3;EOID=912C17E4;SOID=84033B43;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" style="Mode=3;EOID=25B7B193;SOID=9D28AB25;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" style="Mode=3;EOID=6FDEBD0A;SOID=99774DFD;Color=-1;LWidth=0;Hidden=0;"/>
@@ -46768,24 +49071,26 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=912C17E4;SOID=99774DFD;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=57;SY=-7;EX=-8;EY=-26;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A96EE97A_4EB7_40ad_BB96_01E8B1F3E49F" style="Mode=3;EOID=CEE9369E;SOID=25B7B193;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-3;SY=-4;EX=-3;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" style="Mode=3;EOID=CEE9369E;SOID=912C17E4;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=AD8D8418;SOID=B9085702;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;SX=120;SY=54;EX=-35;EY=-28;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=25B7B193;SOID=114798C0;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_93DECF1F_F76C_4644_8A56_143EE13FBA49">
 				<model package="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B" localID="327" owner="EAPK_2846C82F_2923_4ef1_82D2_D1A24252A14B"/>
 				<properties name="terms top hierarchy" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-04-25 16:23:44" modified="2023-07-12 18:45:45"/>
+				<project author="lps" version="1.0" created="2022-04-25 16:23:44" modified="2023-08-03 15:51:00"/>
 				<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=483C8E98;"/>
+				<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=46344E91;"/>
 				<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=299;Top=96;Right=432;Bottom=133;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="1" style="DUID=511D54AF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=133;Top=182;Right=310;Bottom=274;" subject="EAID_D67F46E0_2B15_4614_A170_F1414A602530" seqno="2" style="DUID=64D01B62;"/>
-					<element geometry="Left=181;Top=18;Right=261;Bottom=52;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="3" style="NSL=0;DUID=BFCF6EF0;"/>
-					<element geometry="Left=154;Top=95;Right=287;Bottom=132;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="4" style="DUID=04BF6DE9;NSL=0;"/>
-					<element geometry="Left=10;Top=95;Right=143;Bottom=132;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="5" style="DUID=C2A5D413;NSL=0;"/>
+					<element geometry="Left=469;Top=186;Right=751;Bottom=256;" subject="EAID_7D5A2915_BFCE_41da_BDCF_E7310A70B190" seqno="1" style="DUID=C7CC4D3B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=313;Top=186;Right=446;Bottom=223;" subject="EAID_F7EC5BAF_BF10_4e4d_BAF3_ED8B1330B5E6" seqno="2" style="DUID=511D54AF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=147;Top=272;Right=324;Bottom=364;" subject="EAID_D67F46E0_2B15_4614_A170_F1414A602530" seqno="3" style="DUID=64D01B62;"/>
+					<element geometry="Left=292;Top=103;Right=372;Bottom=137;" subject="EAID_2EA60428_7256_4fad_B1DF_AD05AE937E9D" seqno="4" style="NSL=0;DUID=BFCF6EF0;"/>
+					<element geometry="Left=168;Top=185;Right=301;Bottom=222;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="5" style="DUID=04BF6DE9;NSL=0;"/>
+					<element geometry="Left=24;Top=185;Right=157;Bottom=222;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="6" style="DUID=C2A5D413;NSL=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_01F4D5D0_A9BC_466c_B263_41FB53AE1719" style="Mode=3;EOID=BFCF6EF0;SOID=C7CC4D3B;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_4E2F4576_DD32_4ca9_97F8_19A9D21CBAEB" style="Mode=3;EOID=04BF6DE9;SOID=64D01B62;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_285BF543_AB60_4346_9E70_090B7DE95623" style="Mode=3;EOID=BFCF6EF0;SOID=511D54AF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=3;SY=-2;EX=3;EY=-2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A5B20E6A_8922_4f1d_9A94_0EFFDFC4B060" style="Mode=3;EOID=BFCF6EF0;SOID=04BF6DE9;Color=-1;LWidth=0;Hidden=0;"/>
@@ -46795,85 +49100,91 @@
 			<diagram xmi:id="EAID_50C91B53_24EC_4381_8FBC_58D5E1FF319F">
 				<model package="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6" localID="232" owner="EAPK_73F19627_5000_4c29_8C5A_E36C25D1B2F6"/>
 				<properties name="participation request term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-17 16:39:54" modified="2023-07-13 06:43:13"/>
+				<project author="lps" version="1.0" created="2022-01-17 16:39:54" modified="2023-09-11 17:12: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=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=7A125865;"/>
+				<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=9A4BC3B7;"/>
 				<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=231;Top=183;Right=394;Bottom=215;" subject="EAID_A5237BED_B8B5_4c40_A10D_2BA34123A366" seqno="1" style="DUID=28690641;NSL=0;"/>
-					<element geometry="Left=394;Top=308;Right=557;Bottom=340;" subject="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" seqno="2" style="DUID=B24966CC;NSL=0;"/>
-					<element geometry="Left=68;Top=308;Right=231;Bottom=340;" subject="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" seqno="3" style="DUID=758CDCDF;NSL=0;"/>
-					<element geometry="Left=557;Top=66;Right=668;Bottom=118;" 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=2D808539;"/>
-					<element geometry="Left=268;Top=57;Right=358;Bottom=127;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="5" style="DUID=E5BE95F4;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=394;Top=290;Right=557;Bottom=322;" subject="EAID_9403AC67_80A3_4c77_9299_6171EF9D6788" seqno="2" style="DUID=B24966CC;NSL=0;"/>
+					<element geometry="Left=68;Top=290;Right=231;Bottom=322;" subject="EAID_572B82B3_FF4C_43b8_9C2C_09AD5D3F4615" seqno="3" style="DUID=758CDCDF;NSL=0;"/>
+					<element geometry="Left=552;Top=76;Right=663;Bottom=128;" 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=2D808539;"/>
+					<element geometry="Left=268;Top=77;Right=358;Bottom=127;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="5" style="DUID=E5BE95F4;NSL=0;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;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132: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=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=E5BE95F4;SOID=2D808539;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_41D43466_5575_4752_B3BF_0CA7ADD341E4" style="Mode=3;EOID=E5BE95F4;SOID=28690641;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=-3;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=172: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=-26:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=146:-199$;" subject="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" style="Mode=3;EOID=758CDCDF;SOID=28690641;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=0;EX=-3;EY=0;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=172:CY=14:OX=94:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-26:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=146:-199$;" subject="EAID_5CFE789F_365A_4f79_AABC_E6BE700C4FCC" style="Mode=3;EOID=758CDCDF;SOID=28690641;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=168:CY=14:OX=86:OY=-20: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=475:-200$;" subject="EAID_255D53F4_253B_4698_B2EF_82E934FAC2F4" style="Mode=3;EOID=B24966CC;SOID=28690641;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C8DC6361_5EBA_4481_8EFD_D6B0AD8DA1B4">
 				<model package="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269" localID="244" owner="EAPK_769C1965_8BFA_4989_A35B_F3AD33190269"/>
 				<properties name="review term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-21 09:50:58" modified="2023-07-13 06:49:38"/>
+				<project author="lps" version="1.0" created="2022-01-21 09:50:58" modified="2023-09-11 17:41: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=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=EDC9AB99;"/>
+				<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=48D4554A;"/>
 				<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=79;Top=226;Right=335;Bottom=301;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="1" style="DUID=A0E7A7BF;"/>
-					<element geometry="Left=116;Top=380;Right=299;Bottom=450;" subject="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" seqno="2" style="NSL=0;DUID=A7CEA51A;"/>
-					<element geometry="Left=419;Top=114;Right=669;Bottom=173;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="3" style="DUID=F7C2C561;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=162;Top=120;Right=252;Bottom=166;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="4" style="DUID=3B347C1A;NSL=0;BCol=-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=380;Right=509;Bottom=450;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="5" style="DUID=9C13B6ED;NSL=0;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=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=50: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=460:-254$;" subject="EAID_1B531817_E843_4c42_8EA1_111804B30C38" style="Mode=3;EOID=9C13B6ED;SOID=A0E7A7BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="Left=211;Top=209;Right=489;Bottom=320;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="1" style="DUID=09CF0485;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=281;Top=103;Right=420;Bottom=149;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="2" style="DUID=5807EF31;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=500;Top=209;Right=756;Bottom=294;" subject="EAID_287B17E9_58E6_4b6b_95D1_9F9A3F8B34D8" seqno="3" style="DUID=A0E7A7BF;"/>
+					<element geometry="Left=537;Top=351;Right=720;Bottom=421;" subject="EAID_DCE733E5_38D7_4e94_A8B8_B385E9A6811B" seqno="4" style="NSL=0;DUID=A7CEA51A;"/>
+					<element geometry="Left=826;Top=97;Right=951;Bottom=156;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="5" style="DUID=F7C2C561;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=583;Top=103;Right=673;Bottom=149;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="6" style="DUID=3B347C1A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=844;Top=351;Right=934;Bottom=421;" subject="EAID_07601514_1C57_47ce_9A2D_CD97C5116067" seqno="7" style="DUID=9C13B6ED;NSL=0;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=-90;SY=0;EX=-13;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=8: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=260:-72$875:-72$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=F7C2C561;SOID=09CF0485;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160: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=;" subject="EAID_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=5807EF31;SOID=09CF0485;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-94;SY=0;EX=0;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=534:-127$;" subject="EAID_C7F7FABE_11B6_42f1_8310_BCB1832C647A" style="Mode=3;EOID=5807EF31;SOID=A0E7A7BF;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=-7;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=50: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=882:-250$;" subject="EAID_1B531817_E843_4c42_8EA1_111804B30C38" style="Mode=3;EOID=9C13B6ED;SOID=A0E7A7BF;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=202:CY=14:OX=115: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_229C17AB_3D5F_4ffe_AC22_DE4C7CCE3C2E" style="Mode=3;EOID=A7CEA51A;SOID=A0E7A7BF;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_B3295353_448F_433c_921A_A4E96D0B2738" style="Mode=3;EOID=3B347C1A;SOID=A0E7A7BF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=27:OX=31: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_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=3B347C1A;SOID=F7C2C561;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_7DEB98FB_35C4_4015_80BE_9C778A0BA2A5" style="Mode=3;EOID=3B347C1A;SOID=F7C2C561;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_38144752_9ABC_4c2a_B03E_C2B16451B7D1">
 				<model package="EAPK_3A47255F_6E4B_400c_B002_879945E85F53" localID="222" owner="EAPK_3A47255F_6E4B_400c_B002_879945E85F53"/>
 				<properties name="access term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-16 15:41:30" modified="2023-07-13 06:51:32"/>
+				<project author="lps" version="1.0" created="2022-01-16 15:41:30" modified="2023-09-11 17:41: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=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=0882B4E8;"/>
+				<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=C466EA9C;"/>
 				<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=884;Top=269;Right=1148;Bottom=331;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="1" style="DUID=A204B865;"/>
-					<element geometry="Left=1351;Top=366;Right=1645;Bottom=483;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=FE822C05;"/>
-					<element geometry="Left=1099;Top=390;Right=1201;Bottom=460;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=3AD21742;"/>
-					<element geometry="Left=516;Top=744;Right=747;Bottom=814;" subject="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" seqno="4" style="DUID=C7B65AE3;NSL=0;"/>
+					<element geometry="Left=902;Top=275;Right=1166;Bottom=337;" subject="EAID_BA1BBA64_88B1_420e_8141_092908A95E2B" seqno="1" style="DUID=A204B865;"/>
+					<element geometry="Left=1352;Top=353;Right=1646;Bottom=470;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=FE822C05;"/>
+					<element geometry="Left=1099;Top=353;Right=1201;Bottom=423;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=3AD21742;"/>
+					<element geometry="Left=516;Top=713;Right=747;Bottom=783;" subject="EAID_EA883AD5_9C26_467b_90B7_4F724B6E5E5E" seqno="4" style="DUID=C7B65AE3;NSL=0;"/>
 					<element geometry="Left=1263;Top=734;Right=1432;Bottom=814;" 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=3CB70699;"/>
 					<element geometry="Left=777;Top=403;Right=1011;Bottom=473;" subject="EAID_E13C8393_D02E_4800_B8D5_38C02E2C8998" seqno="6" style="DUID=474BC7BA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=763;Top=744;Right=902;Bottom=814;" subject="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" seqno="7" style="DUID=8D5CDC87;NSL=0;"/>
-					<element geometry="Left=421;Top=285;Right=644;Bottom=370;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="8" style="DUID=E54A619A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=763;Top=713;Right=902;Bottom=783;" subject="EAID_A958E5F1_29FE_4263_AEBA_5D8644A7677A" seqno="7" style="DUID=8D5CDC87;NSL=0;"/>
+					<element geometry="Left=430;Top=306;Right=653;Bottom=391;" subject="EAID_82AA47D1_6939_4328_8108_0018817C75BD" seqno="8" style="DUID=E54A619A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1144;Top=686;Right=1240;Bottom=756;" subject="EAID_764ADB33_6CC8_4ea5_84A7_67A71EAC64C6" seqno="9" style="DUID=4B93C80E;NSL=0;BCol=-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=526;Right=1055;Bottom=634;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="10" style="DUID=92C06F0D;NSL=0;BCol=-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=686;Right=1089;Bottom=756;" subject="EAID_62C31D77_4E31_4ca5_B58B_69C5C0769E62" seqno="11" style="DUID=053BF930;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1373;Top=197;Right=1623;Bottom=282;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" 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=44B58DDA;"/>
 					<element geometry="Left=441;Top=433;Right=643;Bottom=586;" subject="EAID_29678A10_6473_461a_BE84_76269B5BBD68" seqno="13" style="DUID=6C2D04AC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1234;Top=316;Right=1324;Bottom=376;" subject="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" seqno="14" style="DUID=EC61850D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1228;Top=460;Right=1318;Bottom=520;" subject="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" seqno="14" style="DUID=EC61850D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1215;Top=535;Right=1406;Bottom=587;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" seqno="15" style="DUID=2ACFDBA3;NSL=0;BCol=-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=192;Right=823;Bottom=262;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="16" style="DUID=AD5CA664;NSL=0;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=-8;EX=0;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=1: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_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" style="Mode=3;EOID=2ACFDBA3;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-8;EX=0;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149: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=;" subject="EAID_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" style="Mode=3;EOID=2ACFDBA3;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=9;EX=0;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=27:OX=9:OY=-12: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=3AD21742;SOID=FE822C05;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=70: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=44B58DDA;SOID=FE822C05;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=6;SY=0;EX=0;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=531:-236$;" subject="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" style="Mode=3;EOID=AD5CA664;SOID=E54A619A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-2;SY=-5;EX=26;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=60: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_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=6C2D04AC;SOID=E54A619A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=81: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_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=44B58DDA;SOID=FE822C05;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=3;SY=0;EX=0;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=544:-236$;" subject="EAID_85E14E41_3BA7_4783_A633_615CD23835C1" style="Mode=3;EOID=AD5CA664;SOID=E54A619A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=2;SY=-4;EX=7;EY=16;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_15042E3E_B61C_4d75_BF56_83000481AB12" style="Mode=3;EOID=3AD21742;SOID=E54A619A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-2;SY=-5;EX=26;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=60: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_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=6C2D04AC;SOID=E54A619A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-128;SY=40;EX=-12;EY=-35;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D31D53E1_9D45_461d_A55B_588C65D0E49D" style="Mode=3;EOID=AD5CA664;SOID=92C06F0D;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=125;SY=13;EX=11;EY=18;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=27:OX=18: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=-25: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=AD5CA664;SOID=44B58DDA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=16;EY=1;SX=16;SY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=72: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_D7D6284A_096F_4112_989F_32AD38804C63" style="Mode=3;EOID=053BF930;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-13;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=956:-235$;" subject="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" style="Mode=3;EOID=AD5CA664;SOID=A204B865;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=126;SY=0;EX=0;EY=-11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=0: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=1019:-357$;" subject="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" style="Mode=3;EOID=EC61850D;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-34;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1000:-235$;" subject="EAID_AE27FB70_7F60_4b0a_84EA_F015F6FE1271" style="Mode=3;EOID=AD5CA664;SOID=A204B865;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=154;SY=0;EX=0;EY=-8;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=166:CY=14:OX=0: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=1047:-498$;" subject="EAID_F1286B9A_905F_403f_B180_ECBF0307105F" style="Mode=3;EOID=EC61850D;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=-11;EY=0;SX=0;SY=-20;$LLB=;LLT=;LMT=;LMB=;LRT=CX=224:CY=14:OX=117: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=620:-600$;" subject="EAID_ADDE70B2_FCDD_46b7_8DA7_19386DB49579" style="Mode=3;EOID=C7B65AE3;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=87: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_C2B3B9B6_7AFD_4b8c_8502_C5AC8F9FFC84" style="Mode=3;EOID=8D5CDC87;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=48;SY=0;EX=0;EY=-12;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=105:CY=14:OX=-35: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=941:-786$;" subject="EAID_E425948E_6ABD_4c9b_83A7_6E582F53DA90" style="Mode=3;EOID=3CB70699;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=138;SY=0;EX=0;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1031:-424$;" subject="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" style="Mode=3;EOID=3AD21742;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=133;SY=0;EX=0;EY=-21;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1026:-409$;" subject="EAID_405A688E_2CD5_4d16_B4F1_E98AB4374F1C" style="Mode=3;EOID=3AD21742;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=-11;SY=0;EX=0;EY=-30;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=874:-257$;" subject="EAID_2EFFE2EC_6B27_4d48_B910_6C37C39CAAFC" style="Mode=3;EOID=AD5CA664;SOID=474BC7BA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;SX=0;SY=-20;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=74: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=1192:-600$;" subject="EAID_7CFA8589_17C4_41df_B066_E37D4DDD0C0A" style="Mode=3;EOID=4B93C80E;SOID=92C06F0D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
@@ -46881,37 +49192,37 @@
 			<diagram xmi:id="EAID_5BF26AED_231A_435a_ABCE_4EEF97F1ED4A">
 				<model package="EAPK_094322B0_93A9_4632_B662_C313D87D9F60" localID="221" owner="EAPK_094322B0_93A9_4632_B662_C313D87D9F60"/>
 				<properties name="procedure term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-16 15:30:16" modified="2023-07-13 06:52:57"/>
+				<project author="lps" version="1.0" created="2022-01-16 15:30:16" modified="2023-09-11 17:43: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=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=2FDB76D9;"/>
+				<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=4DF6E1F8;"/>
 				<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=959;Top=548;Right=1049;Bottom=618;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="1" style="DUID=B4C35FE8;NSL=0;"/>
+					<element geometry="Left=959;Top=517;Right=1049;Bottom=587;" subject="EAID_2713F23E_8090_434d_B7BD_BF404238BDB5" seqno="1" style="DUID=B4C35FE8;NSL=0;"/>
 					<element geometry="Left=1177;Top=363;Right=1283;Bottom=415;" subject="EAID_A312F200_1050_451d_97BB_07EBCE11D45C" seqno="2" style="DUID=98206819;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=423;Top=289;Right=437;Bottom=303;" subject="EAID_A12215FE_1DC3_4e8c_B823_3C4BB4A7AE6C" seqno="3" style=" DUID=18FAC92F;"/>
 					<element geometry="Left=499;Top=331;Right=727;Bottom=442;" subject="EAID_96B284C4_E759_4bad_9655_04521F703750" seqno="4" style="DUID=0AF8C1AA;NSL=0;BCol=-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=310;Right=1049;Bottom=467;" subject="EAID_952A6222_7ED2_4ca4_A084_E51BAA1CF00D" seqno="5" style="DUID=319C6D0B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=78;Top=95;Right=372;Bottom=297;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="6" style="DUID=CB77CCB7;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=573;Top=237;Right=587;Bottom=251;" subject="EAID_70B4792E_F818_45db_80A4_32F092496FEF" seqno="7" style=" DUID=E452B8F8;"/>
-					<element geometry="Left=762;Top=549;Right=852;Bottom=619;" subject="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" seqno="8" style="DUID=51F5B7EC;NSL=0;BCol=-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=517;Right=852;Bottom=587;" subject="EAID_5696AD02_F9CD_40d0_94EC_172DCDA4EF78" seqno="8" style="DUID=51F5B7EC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=162;Top=369;Right=288;Bottom=421;" subject="EAID_49EC0F16_408C_4b28_B611_0048946DC070" seqno="9" style="DUID=99909108;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1277;Top=217;Right=1367;Bottom=277;" subject="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" seqno="10" style="DUID=1F17960A;NSL=0;BCol=-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=32;Right=1167;Bottom=156;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="11" style="DUID=283FA908;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1330;Top=217;Right=1420;Bottom=277;" subject="EAID_3D50DF5F_3CD6_4ccc_88D7_A606F48EEBAE" seqno="10" style="DUID=1F17960A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1003;Top=32;Right=1177;Bottom=156;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="11" style="DUID=283FA908;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=527;Top=135;Right=629;Bottom=205;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" seqno="12" style="DUID=5E7DE761;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=818;Top=187;Right=908;Bottom=257;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="13" style="DUID=5B47D52A;NSL=0;BCol=-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=207;Right=1141;Bottom=277;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" seqno="14" style="DUID=16C2A66A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=818;Top=187;Right=989;Bottom=257;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="13" style="DUID=5B47D52A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1003;Top=207;Right=1194;Bottom=277;" subject="EAID_0A227254_932A_487b_B10A_658AA61F3CAD" seqno="14" style="DUID=16C2A66A;NSL=0;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=-27;SY=10;EX=1;EY=10;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=27: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_E076346D_AFB2_421a_BBA1_4FFA393BE7FA" style="Mode=3;EOID=99909108;SOID=0AF8C1AA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=14;EX=1;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131: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=1180:-228$1180:-17$226:-17$;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=CB77CCB7;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=30;EX=-4;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=131: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=1238:-212$1238:-14$221:-14$;" subject="EAID_5A6933BC_AE5B_4536_B67E_B79F177247C7" style="Mode=3;EOID=CB77CCB7;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143:CY=14:OX=83: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_34156914_725C_4a26_B380_6FDE59360DAF" style="Mode=3;EOID=283FA908;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=8;SY=-27;EX=5;EY=-13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133: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_279636BF_8F0D_4744_8B59_3277E5CE2E90" style="Mode=3;EOID=1F17960A;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=98;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=67: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_EB8F0271_F439_4d4a_8CF1_D9F81DFCBA1A" style="Mode=3;EOID=B4C35FE8;SOID=319C6D0B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=7;SY=16;EX=3;EY=-10;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90: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_1605A6CC_6F4E_42f1_80CD_0C45E80E9AEE" style="Mode=3;EOID=98206819;SOID=319C6D0B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-115;SY=0;EDGE=1;EX=0;EY=-11;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=790:-181$;" subject="EAID_4C36EE86_0569_4453_9E13_5EC63FC08031" style="Mode=3;EOID=5E7DE761;SOID=319C6D0B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-46;SY=0;EX=0;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=992:-164$;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=5E7DE761;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-48;SY=0;EX=0;EY=6;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1050:-164$;" subject="EAID_A1817A7D_9F04_479b_8F89_5D58DD92BF3C" style="Mode=3;EOID=5E7DE761;SOID=16C2A66A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-18;EY=2;SX=-18;SY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=70: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_869B2877_CC4F_472f_9ED2_7DCA708FAEF8" style="Mode=3;EOID=51F5B7EC;SOID=319C6D0B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-20;SY=0;EX=0;EY=-14;EDGE=1;$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=843:-108$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=283FA908;SOID=5B47D52A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-60;SY=0;EX=0;EY=-14;EDGE=1;$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=843:-108$;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=283FA908;SOID=5B47D52A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=25;SY=-14;EX=25;EY=-23;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87:CY=14:OX=-17:OY=2: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=0AF8C1AA;SOID=99909108;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=0;SY=-48;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=39: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=613:-244$;" subject="EAID_9B2D6DCC_5092_48cf_878A_8035A42A43F9" style="Mode=3;EOID=0AF8C1AA;SOID=CB77CCB7;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=189:CY=14:OX=100: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_28460B26_E1D3_4c16_AB2B_CBE8A5D24AC5" style="Mode=3;EOID=99909108;SOID=CB77CCB7;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -46925,49 +49236,55 @@
 			<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="2023-07-13 06:54:29"/>
+				<project author="lps" version="1.0" created="2022-01-16 15:50:02" modified="2023-08-03 16:58: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=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=E303D24E;"/>
+				<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=7DDB3266;"/>
 				<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=503;Top=603;Right=593;Bottom=668;" subject="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" seqno="1" style="DUID=0B1CB9AC;NSL=0;"/>
-					<element geometry="Left=197;Top=439;Right=287;Bottom=499;" subject="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" seqno="2" style="DUID=517A967B;NSL=0;BCol=-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=165;Right=307;Bottom=276;" 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=49CCE5BA;"/>
-					<element geometry="Left=947;Top=606;Right=1037;Bottom=666;" subject="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" seqno="4" style="DUID=F44478DA;NSL=0;BCol=-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=603;Right=735;Bottom=668;" subject="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" seqno="5" style="DUID=4A3BCEC1;NSL=0;"/>
-					<element geometry="Left=503;Top=334;Right=833;Bottom=539;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="6" style="DUID=BE572B7D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=973;Top=184;Right=1134;Bottom=257;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="7" style="DUID=2925BA43;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=483;Top=188;Right=585;Bottom=253;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=B5FB2BEC;"/>
-					<element geometry="Left=197;Top=345;Right=287;Bottom=405;" subject="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" seqno="9" style="DUID=F0D4B537;NSL=0;BCol=-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=263;Right=947;Bottom=323;" subject="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" seqno="10" style="DUID=F994F523;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=947;Top=479;Right=1037;Bottom=539;" subject="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" seqno="11" style="DUID=FD8EA106;NSL=0;BCol=-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=394;Right=1233;Bottom=479;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="12" style="DUID=37E20E9B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=623;Top=188;Right=713;Bottom=253;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="13" style="DUID=FCF56E28;NSL=0;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;$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=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=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=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98: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_D07B06AA_2E5B_4fa1_B0EA_CB49790C2AAD" style="Mode=3;EOID=37E20E9B;SOID=BE572B7D;Color=-1;LWidth=0;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="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=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="Left=1303;Top=469;Right=1393;Bottom=529;" subject="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" seqno="1" style="DUID=BD64B6D9;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1265;Top=350;Right=1431;Bottom=420;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="2" style="DUID=1776509F;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1106;Top=370;Right=1196;Bottom=398;" subject="EAID_F5B54CD5_45A5_4220_A1F4_9F1CD0DD9969" seqno="3" style="DUID=A0B3CC86;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=503;Top=603;Right=593;Bottom=668;" subject="EAID_FD0308FC_9EDA_4a54_A4B6_FBCE76BF76A2" seqno="4" style="DUID=0B1CB9AC;NSL=0;"/>
+					<element geometry="Left=197;Top=439;Right=287;Bottom=499;" subject="EAID_A8A23909_CD9D_402e_B37A_C9F795BD0521" seqno="5" style="DUID=517A967B;NSL=0;BCol=-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=165;Right=307;Bottom=276;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" 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=49CCE5BA;"/>
+					<element geometry="Left=947;Top=606;Right=1037;Bottom=666;" subject="EAID_8B37BCB9_9B2F_4a90_8339_DA7B0472F42E" seqno="7" style="DUID=F44478DA;NSL=0;BCol=-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=603;Right=735;Bottom=668;" subject="EAID_73C42C68_C5D6_4b6c_AA94_2CA27746393B" seqno="8" style="DUID=4A3BCEC1;NSL=0;"/>
+					<element geometry="Left=503;Top=334;Right=833;Bottom=539;" subject="EAID_394D9649_C70C_437b_8DE2_A3943CDEC6CA" seqno="9" style="DUID=BE572B7D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=973;Top=184;Right=1134;Bottom=257;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="10" style="DUID=2925BA43;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=483;Top=188;Right=585;Bottom=253;" subject="EAID_223696B2_E889_41a8_B53F_E7A5B530FFFD" 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=B5FB2BEC;"/>
+					<element geometry="Left=197;Top=345;Right=287;Bottom=405;" subject="EAID_1FF5173E_4940_44db_A1A0_C190337F6440" seqno="12" style="DUID=F0D4B537;NSL=0;BCol=-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=263;Right=947;Bottom=323;" subject="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" seqno="13" style="DUID=F994F523;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=947;Top=479;Right=1037;Bottom=539;" subject="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" seqno="14" style="DUID=FD8EA106;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1062;Top=422;Right=1238;Bottom=479;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="15" style="DUID=37E20E9B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=623;Top=188;Right=713;Bottom=253;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="16" style="DUID=FCF56E28;NSL=0;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=23;EX=4;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=183: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8A3EF8BD_C6F5_4027_9D0A_235327E62C6E" style="Mode=3;EOID=F0D4B537;SOID=BE572B7D;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=3;EX=0;EY=-3;SX=100;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=172:CY=14:OX=-7: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=768:-639$;" subject="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" style="Mode=3;EOID=F44478DA;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="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="SX=-17;SY=-1;EX=-17;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" style="Mode=3;EOID=B5FB2BEC;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;EX=14;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=-10: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=160:-154$1067:-154$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=2925BA43;SOID=49CCE5BA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=62:CY=14:OX=42: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_90566F74_64BC_49c8_8076_1ECB982268EE" style="Mode=3;EOID=BD64B6D9;SOID=1776509F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FE0B0FB5_E0B6_41e2_AA82_ECF06C845021" style="Mode=3;EOID=A0B3CC86;SOID=1776509F;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-17;SY=-1;EX=-17;EY=-1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6248DC7A_ACC5_4553_92ED_5A488B7D6FC6" style="Mode=3;EOID=B5FB2BEC;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<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=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;$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=-7: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=768:-639$;" subject="EAID_C144677A_178B_495d_A1CC_20D0D20B3AD0" style="Mode=3;EOID=F44478DA;SOID=BE572B7D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_C9FE03EA_71D7_4074_8F14_C707D7228C43">
 				<model package="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9" localID="225" owner="EAPK_17292ABC_45DF_4e58_B916_AECA97F87EE9"/>
 				<properties name="contract term" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-16 16:06:06" modified="2023-07-13 07:17:33"/>
+				<project author="lps" version="1.0" created="2022-01-16 16:06:06" modified="2023-09-01 15:39:20"/>
 				<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=5CA83454;"/>
+				<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=4B7F243F;"/>
 				<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/>
@@ -46992,7 +49309,7 @@
 					<element geometry="Left=1139;Top=839;Right=1229;Bottom=909;" subject="EAID_7D0E71D7_D624_4144_8134_2500CE9AB392" seqno="18" style="DUID=4E9D6EB1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1069;Top=433;Right=1330;Bottom=531;" subject="EAID_44E7963D_28F5_4263_835A_24C87816F40C" seqno="19" style="DUID=82177136;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1457;Top=647;Right=1780;Bottom=865;" subject="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" seqno="20" style="DUID=A6B5F002;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=713;Top=531;Right=1016;Bottom=655;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" seqno="21" style="DUID=04205726;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=713;Top=532;Right=1016;Bottom=656;" subject="EAID_3F572668_3AED_4090_BAB3_9047B4874154" seqno="21" style="DUID=04205726;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1794;Top=254;Right=2109;Bottom=378;" subject="EAID_361EB2A1_DEC9_43b6_9E5F_29ED464CE561" seqno="22" style="DUID=1A2F6D8B;NSL=0;BCol=-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=123;Right=1046;Bottom=192;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="23" style="DUID=78E7F44D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=897;Top=839;Right=1063;Bottom=909;" subject="EAID_2F5290F3_4300_467c_8EA9_58FC31BC055C" seqno="24" style="DUID=42AD5E7C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -47001,26 +49318,26 @@
 					<element geometry="Left=1413;Top=961;Right=1590;Bottom=1021;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="27" style="DUID=B52D960D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1110;Top=586;Right=1288;Bottom=656;" subject="EAID_0BAFFD1A_4916_467e_AAF2_9B8BD55CD496" 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=2CAB64BC;"/>
 					<element geometry="Left=943;Top=281;Right=1033;Bottom=351;" subject="EAID_0A8134EF_5350_4dc9_A7AF_B408BAFEB940" seqno="29" style="DUID=F340A9F1;NSL=0;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=5;SY=-19;EX=5;EY=-17;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120: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_A01E8ADE_1698_4353_BEDB_63334B745ECB" style="Mode=3;EOID=416C78F2;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;SX=-25;SY=1;EX=-2;EY=-33;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=1C67DBAE;SOID=A6B5F002;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=416C78F2;SOID=4E9D6EB1;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=3;SY=67;EX=3;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=123: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=-8:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_001164A7_CB8C_462e_BBD0_75D03FADA8D8" style="Mode=3;EOID=634574AF;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;EX=0;EY=30;SX=0;SY=-77;$LLB=;LLT=;LMT=;LMB=;LRT=CX=143: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=1323:-833$;" subject="EAID_12A5A0C6_97F3_4362_97F5_2EACA8AA8D1B" style="Mode=3;EOID=B060B940;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=72;SY=0;EX=0;EY=-31;$LLB=;LLT=;LMT=;LMB=;LRT=CX=110:CY=27:OX=8: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=1690:-347$;" subject="EAID_F593B546_502A_413a_8694_914903478877" style="Mode=3;EOID=1A2F6D8B;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=91;SY=-100;EX=38;EY=-2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=118:CY=14:OX=76:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=1:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_DB75B7B6_85A1_4c67_A458_85EFC44E06B4" style="Mode=3;EOID=44A81AFD;SOID=A6B5F002;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=19;SY=-108;EX=-33;EY=-21;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=76:OY=-45:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=1:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_EA34DF45_5E55_4138_B248_D15B011F82E1" style="Mode=3;EOID=44A81AFD;SOID=A6B5F002;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-116;SY=0;EX=2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=122: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=;" subject="EAID_B0D4CDC5_3F31_4f44_9C9D_C9C33A874154" style="Mode=3;EOID=8486D7E9;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-11;EX=0;EY=-11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165: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_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" style="Mode=3;EOID=44F6EAB1;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=72:CY=14:OX=42: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=;" subject="EAID_B851F167_3C73_4e45_9F54_76A56333BE1E" style="Mode=3;EOID=2CAB64BC;SOID=82177136;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-119;SY=0;EX=0;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=66: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_FAA22183_A73E_42a1_854B_9995087470E4" style="Mode=3;EOID=B52D960D;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-48;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152: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=816:-767$;" subject="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" style="Mode=3;EOID=416C78F2;SOID=04205726;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F8285143_A232_43ae_AFC8_89D40A9529FD" style="Mode=3;EOID=416C78F2;SOID=4E9D6EB1;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=5;SY=-19;EX=5;EY=-17;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=120: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_A01E8ADE_1698_4353_BEDB_63334B745ECB" style="Mode=3;EOID=416C78F2;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=-9;EX=-3;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=F340A9F1;SOID=04205726;Color=-1;LWidth=0;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=416C78F2;SOID=42AD5E7C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=4;EY=4;EDGE=3;SX=-6;SY=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=62:CY=14:OX=38: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_90566F74_64BC_49c8_8076_1ECB982268EE" style="Mode=3;EOID=637D24F3;SOID=42AD5E7C;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=10;SY=-2;EX=10;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89:CY=14:OX=48: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_06D187DF_9192_4549_BE01_736C22D89AEA" style="Mode=3;EOID=7F2D49F0;SOID=44F6EAB1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-15;EY=2;SX=-15;SY=2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=76:CY=14:OX=49: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_8A0DF9CA_F904_4d6e_850E_F68332FB1B0B" style="Mode=3;EOID=880EC325;SOID=44F6EAB1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=1;SY=0;EX=-4;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=80:CY=14:OX=48: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=1200:-683$161:-683$;" subject="EAID_EBC0DED2_0415_4ef8_A495_71F8920238AD" style="Mode=3;EOID=D3D4F5EF;SOID=2CAB64BC;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=6;SY=48;EX=44;EY=-23;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4E161D86_3C31_466f_982A_26607071A85E" style="Mode=3;EOID=F340A9F1;SOID=82177136;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-11;EX=0;EY=-11;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165: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_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" style="Mode=3;EOID=44F6EAB1;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-5;SY=17;EX=-5;EY=17;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=245: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_B0C50180_5437_4a3f_9E66_5EBEFD7759BC" style="Mode=3;EOID=D3D4F5EF;SOID=1A0EF1EE;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_92B9F8CA_DE72_46e6_993E_46C9ED67ADFA" style="Mode=3;EOID=5344339E;SOID=82177136;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-119;SY=0;EX=0;EY=-3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=111:CY=14:OX=66: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_FAA22183_A73E_42a1_854B_9995087470E4" style="Mode=3;EOID=B52D960D;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=5344339E;SOID=1A0EF1EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=0;SY=0;EX=0;EY=-25;$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=1273:-182$;" subject="EAID_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=78E7F44D;SOID=C7936F71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=86;SY=0;EX=0;EY=17;$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=1359:-739$;" subject="EAID_C741BADB_0CAC_40d5_A730_696A39D2224E" style="Mode=3;EOID=416C78F2;SOID=C7936F71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=0;SX=46;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=94:CY=14:OX=37: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=1319:-31$165:-31$;" subject="EAID_3220FB6D_76C7_486a_9953_EA1E6D255A89" style="Mode=3;EOID=D3D4F5EF;SOID=C7936F71;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -47028,16 +49345,16 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=160:CY=14:OX=88:OY=-20: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_1C8C734E_FD33_4153_9939_FA613CEB5D22" style="Mode=3;EOID=5344339E;SOID=421468D6;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=10;SY=0;EX=-2;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=717:-57$1590:-57$;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=F149C5F8;SOID=421468D6;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-1;SY=1;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=132: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=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=F340A9F1;SOID=78E7F44D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=122;SY=0;EX=0;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113: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=1740:-560$;" subject="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" style="Mode=3;EOID=8CBCC18A;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-26;EX=0;EY=-25;EDGE=4;$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=;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=D3D4F5EF;SOID=1A0EF1EE;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=6;SY=-9;EX=-3;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EA8BA09A_3CC1_4c02_A5CD_27AE1D84CDDE" style="Mode=3;EOID=F340A9F1;SOID=04205726;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=1;SX=-25;SY=1;EX=-2;EY=-33;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=1C67DBAE;SOID=A6B5F002;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;EX=-22;EY=-6;SX=-22;SY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=149:CY=14:OX=77: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=;" subject="EAID_B02CD525_7AD7_45d7_B20C_514E7B961066" style="Mode=3;EOID=DBFD8F29;SOID=1A0EF1EE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_6591B482_9D9E_4650_897A_253ACD64FC8A" style="Mode=3;EOID=5344339E;SOID=1A0EF1EE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=122;SY=0;EX=0;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113: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=1740:-560$;" subject="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" style="Mode=3;EOID=8CBCC18A;SOID=A6B5F002;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F9E99464_DED7_437a_98F9_263E29761C37" style="Mode=3;EOID=F340A9F1;SOID=1A0EF1EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=21;SY=-30;EX=-22;EY=-28;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EB5F1306_97D6_4fef_8A8A_E03C23ED1BE1" style="Mode=3;EOID=1C67DBAE;SOID=1A0EF1EE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=138:CY=14:OX=94: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_C8DDF2AD_D50E_4225_A715_E7C9368CEB39" style="Mode=3;EOID=FB1656C7;SOID=1A2F6D8B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;SX=-148;SY=30;EX=0;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1E3BD6A4_59D5_435a_9472_AFC131D1E7F2" style="Mode=3;EOID=1C67DBAE;SOID=1A2F6D8B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-103;SY=0;EX=57;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=221:CY=14:OX=107: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=1489:-45$222:-45$;" subject="EAID_5D416646_B3CA_4c57_AD37_79213AD539C8" style="Mode=3;EOID=D3D4F5EF;SOID=F149C5F8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=-3;SY=-4;EX=-3;EY=-4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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_F1463DF7_672E_4208_A39E_E74480CCE1D0" style="Mode=3;EOID=1C67DBAE;SOID=F149C5F8;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-48;SY=0;EX=0;EY=-11;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152: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=816:-767$;" subject="EAID_EFDCE7F5_7EC7_4537_B26B_232F5FB37A9C" style="Mode=3;EOID=416C78F2;SOID=04205726;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=153:CY=14:OX=-5: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_39B9AB7E_2B60_4f59_8AE5_E5806C9B2562" style="Mode=3;EOID=1C67DBAE;SOID=C7936F71;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=4;SY=5;EX=4;EY=9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_BE41CCFB_8495_440b_ADCE_908A980E0342" style="Mode=3;EOID=F149C5F8;SOID=78E7F44D;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
@@ -47086,11 +49403,11 @@
 				</elements>
 			</diagram>
 			<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="3"/>
+				<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="2023-07-13 07:02:12"/>
+				<project author="lps" version="1.0" created="2022-01-21 10:06:03" modified="2023-09-11 17:47: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=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=35FDC7C8;"/>
+				<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=02B62BA8;"/>
 				<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/>
@@ -47099,59 +49416,61 @@
 					<element geometry="Left=281;Top=464;Right=371;Bottom=524;" subject="EAID_FAC84DE8_1A2E_4a6f_9F36_38EB360ACD58" seqno="2" style="NSL=0;DUID=6A739E33;"/>
 					<element geometry="Left=476;Top=599;Right=583;Bottom=650;" subject="EAID_432BFDAD_99CD_40ab_A159_824F0F6571E2" seqno="3" style="DUID=D0D3882A;NSL=0;"/>
 					<element geometry="Left=485;Top=710;Right=575;Bottom=770;" subject="EAID_B81F2C0E_31F9_4ec0_AC1E_A0960D618FE6" 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=CC50AC73;"/>
-					<element geometry="Left=923;Top=409;Right=937;Bottom=423;" subject="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" seqno="5" style="DUID=04D2F43F;"/>
+					<element geometry="Left=923;Top=374;Right=937;Bottom=388;" subject="EAID_FBAEFE81_BDD9_4cf1_BBB5_EC6BE02F8DBD" seqno="5" style="DUID=04D2F43F;"/>
 					<element geometry="Left=1126;Top=793;Right=1220;Bottom=846;" subject="EAID_FA62ED20_6A09_47b0_BE65_B3A78C349AC2" seqno="6" style="DUID=A1817E91;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1309;Top=500;Right=1525;Bottom=640;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="7" style="DUID=76D9FB14;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1360;Top=473;Right=1576;Bottom=613;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="7" style="DUID=76D9FB14;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=936;Top=278;Right=950;Bottom=292;" subject="EAID_E58666CF_445F_4da3_97FA_8DD2F8F1AD20" seqno="8" style="DUID=4B6CD2C8;"/>
-					<element geometry="Left=1022;Top=398;Right=1219;Bottom=446;" subject="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" seqno="9" style="DUID=CE157179;"/>
+					<element geometry="Left=1023;Top=363;Right=1220;Bottom=411;" subject="EAID_D93BE624_CEEB_4f56_BA1D_59D180B6F8A1" seqno="9" style="DUID=CE157179;"/>
 					<element geometry="Left=588;Top=473;Right=807;Bottom=563;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" seqno="10" style="DUID=6337A339;NSL=0;BCol=-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=398;Right=530;Bottom=450;" subject="EAID_D278CCD5_4E82_42f5_9A9B_C25371C94006" seqno="11" style="DUID=99EC8E8D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=650;Top=826;Right=746;Bottom=858;" subject="EAID_BB22A753_783A_4d79_B795_B4D7DEE0BA53" seqno="12" style="DUID=0D0BC566;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1242;Top=293;Right=1332;Bottom=353;" subject="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" seqno="13" style="DUID=34BEC823;"/>
-					<element geometry="Left=1242;Top=165;Right=1332;Bottom=235;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="14" style="DUID=8D7CBD11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1261;Top=303;Right=1351;Bottom=363;" subject="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" seqno="13" style="DUID=34BEC823;"/>
+					<element geometry="Left=1261;Top=182;Right=1351;Bottom=216;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="14" style="DUID=8D7CBD11;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=174;Top=599;Right=470;Bottom=658;" subject="EAID_A3C531C4_7D75_44cc_BEA3_2E08AC2FE6B2" seqno="15" style="DUID=62D39C5A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=858;Top=165;Right=1074;Bottom=235;" subject="EAID_8A9F443E_7053_4849_B3F6_8FC4EB9806DC" seqno="16" style="DUID=02845E7C;"/>
 					<element geometry="Left=829;Top=715;Right=1076;Bottom=764;" subject="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" seqno="17" style="DUID=A3AD65DA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1331;Top=387;Right=1505;Bottom=457;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="18" style="DUID=5D18EEDB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1381;Top=353;Right=1555;Bottom=423;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="18" style="DUID=5D18EEDB;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=633;Top=710;Right=765;Bottom=769;" subject="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" seqno="19" style="DUID=0BCD7C2C;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=1128;Top=640;Right=1218;Bottom=692;" subject="EAID_47C343CA_8534_4855_8BAE_9C5DE33229E3" seqno="20" style="DUID=0BDE0F7E;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=898;Top=565;Right=1006;Bottom=618;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" 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=56B6C2B8;"/>
 					<element geometry="Left=402;Top=303;Right=492;Bottom=363;" subject="EAID_31165801_5B33_4e47_B39A_04F149020988" seqno="22" style="DUID=49A17B1D;"/>
 					<element geometry="Left=560;Top=294;Right=835;Bottom=371;" subject="EAID_2AB921B3_A050_4c65_95E8_EBFA7B9EEE7D" seqno="23" 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="24" 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=907;Top=441;Right=997;Bottom=483;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="25" 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=1023;Top=473;Right=1194;Bottom=535;" subject="EAID_2046EF02_69A1_4fa0_BF42_2A6E50CAF4E6" seqno="25" 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="26" 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=1073;Top=500;Right=1169;Bottom=565;" subject="EAID_02014F61_A766_467e_BD3D_7F41689C651B" seqno="27" 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=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="SX=-1;SY=0;EX=0;EY=-28;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=27:OX=14: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=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="SX=-2;SY=0;EX=0;EY=5;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=27:OX=8: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=950:-513$;" subject="EAID_FC7073E1_3362_472f_B087_27A619B6C819" style="Mode=3;EOID=6337A339;SOID=E55DC604;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=56B6C2B8;SOID=E55DC604;Color=-1;LWidth=0;Hidden=1;"/>
-					<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;"/>
-					<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="Left=1105;Top=238;Right=1201;Bottom=303;" subject="EAID_02014F61_A766_467e_BD3D_7F41689C651B" seqno="27" 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=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=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="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=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="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="SX=63;SY=0;EX=0;EY=6;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=760:-416$;" subject="EAID_D65C20FC_D382_4766_9563_4C96020D607C" style="Mode=3;EOID=CE157179;SOID=6337A339;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-9;SY=-1;EX=57;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="SX=63;SY=0;EX=0;EY=6;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=760:-381$;" 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="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=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="SX=0;SY=0;EX=0;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=-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=-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=12;SY=-2;EX=-75;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=36:CY=27: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=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=-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=-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="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;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=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;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_20732599_332F_4f0e_BFE6_593632EDB11F" style="Mode=3;EOID=56B6C2B8;SOID=E55DC604;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EX=27;EY=49;SX=44;SY=-8;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=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=0;SY=0;EX=0;EY=0;EDGE=3;SCME=1;SCTR=1;SCTR.LEFT=875;SCTR.TOP=-285;SCTR.RIGHT=1012;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=30:OY=16:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=875:-235$875:-285$1012:-285$1012:-235$;" subject="EAID_6459B897_AEE0_4ae9_BFBB_56453EA7473F" style="Mode=2;EOID=02845E7C;SOID=02845E7C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=3;SX=-2;SY=-19;EX=-21;EY=-3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97: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_91E24989_0AB1_44de_AF48_1EE54018D9E5" style="Mode=3;EOID=37DADC3C;SOID=CE157179;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=-65;SY=23;EX=89;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" style="Mode=3;EOID=02845E7C;SOID=CE157179;Color=-1;LWidth=0;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="SX=0;SY=0;EX=0;EY=0;EDGE=4;$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=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;Hidden=0;"/>
+					<element geometry="SX=0;SY=1;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55: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=1468:-198$;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=5D18EEDB;SOID=8D7CBD11;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-2;SY=1;EX=-2;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=128:CY=14:OX=55: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_A7C105EE_0251_4249_919A_46302D44059E" style="Mode=3;EOID=34BEC823;SOID=8D7CBD11;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-8;EX=-2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55: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=1416:-208$;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=5D18EEDB;SOID=8D7CBD11;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=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=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;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="SX=-65;SY=23;EX=89;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_FAC59FEE_3DE7_4de1_BCBE_35DFB0CE066A" style="Mode=3;EOID=02845E7C;SOID=CE157179;Color=-1;LWidth=0;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="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=0;SY=0;EX=0;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=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=1567:-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=10;SY=-2;EX=-77;EY=-10;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=66: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=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=-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=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">
@@ -47221,6 +49540,40 @@
 					<element geometry="SX=-67;SY=0;EX=0;EY=2;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=350:-595$;" subject="EAID_08EBA2FE_CCEA_4eec_B375_3B680C3FD97A" style="Mode=3;EOID=0FCF8D83;SOID=AFA6A329;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
+			<diagram xmi:id="EAID_275A3D5B_4FDD_464a_96B4_853DDB16EA89">
+				<model package="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" localID="484" owner="EAPK_3D7EB784_FF56_4277_87E3_E7C2F8EF2334" tpos="3"/>
+				<properties name="certification" type="Logical"/>
+				<project author="andreea" version="1.0" created="2023-09-11 17:56:15" modified="2023-09-11 17:56: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;"/>
+				<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=3CDCA79A;"/>
+				<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=300;Top=465;Right=553;Bottom=589;" subject="EAID_029FD14D_C413_41b1_81DD_DA4802D8A322" 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=79A83910;"/>
+					<element geometry="Left=229;Top=195;Right=319;Bottom=243;" subject="EAID_3933401F_18D8_4d45_957E_CAC97A45CD53" 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=DCFEF870;"/>
+					<element geometry="Left=553;Top=229;Right=567;Bottom=243;" subject="EAID_C328FA20_C15A_40a9_A9D6_A8B08A5ACBD7" seqno="3" style="DUID=E6D8A55D;"/>
+					<element geometry="Left=553;Top=361;Right=567;Bottom=375;" subject="EAID_7C89A04E_6BCC_4cb8_B4DC_76817402265D" seqno="4" style="DUID=62D40DD5;"/>
+					<element geometry="Left=421;Top=219;Right=511;Bottom=254;" subject="EAID_B232648D_EE78_45b0_8C41_DD186A53D6A9" seqno="5" style="NSL=0;DUID=4658AA30;"/>
+					<element geometry="Left=675;Top=202;Right=860;Bottom=272;" subject="EAID_86057FC2_7717_4160_8952_6A9F572F43B2" seqno="6" style="NSL=0;DUID=8A5C4834;"/>
+					<element geometry="Left=693;Top=478;Right=842;Bottom=526;" subject="EAID_7C286914_0A87_4d10_9FFD_8653AC16BD03" seqno="7" style="NSL=0;DUID=29942A51;"/>
+					<element geometry="Left=125;Top=332;Right=215;Bottom=402;" subject="EAID_4B2A75AA_D616_435a_99E7_B387A7B402A1" seqno="8" style="NSL=0;DUID=2A1F793A;"/>
+					<element geometry="Left=319;Top=332;Right=534;Bottom=402;" subject="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" seqno="9" style="NSL=0;DUID=6E491AEE;"/>
+					<element geometry="Left=666;Top=332;Right=868;Bottom=402;" subject="EAID_167D3E61_1A8E_44e3_8A6D_3BF200CB4A3C" seqno="10" style="NSL=0;DUID=81991C44;"/>
+					<element geometry="Left=378;Top=56;Right=554;Bottom=141;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" 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=5A78A0E4;"/>
+					<element geometry="SX=1;SY=1;EX=1;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_89FDF957_97A3_47f3_98F1_B3229B558EC4" style="Mode=3;EOID=E6D8A55D;SOID=62D40DD5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=52;SY=3;EX=-1;EY=6;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=-5:OY=-3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_D01BEE04_A51F_434f_9F2B_CD75C658FF42" style="Mode=3;EOID=6E491AEE;SOID=79A83910;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=552;SCTR.TOP=-491;SCTR.RIGHT=583;SCTR.BOTTOM=-475;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=553:-491$583:-491$583:-475$553:-475$;" subject="EAID_2FF93267_E672_481d_B370_202D9A0110E0" style="Mode=3;EOID=79A83910;SOID=79A83910;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SX=0;SY=4;EX=-64;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=85: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=6:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=362:-215$;" subject="EAID_498900B2_4B2A_411b_B5EB_19C2D921F4D1" style="Mode=3;EOID=6E491AEE;SOID=DCFEF870;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="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=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_8990AB87_7AAE_4276_AA04_83E4BB664FCB" style="Mode=3;EOID=8A5C4834;SOID=4658AA30;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=4;SY=1;EX=4;EY=41;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=93:CY=14:OX=50: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_1864913C_FE85_48db_829F_004DFE769A97" style="Mode=2;EOID=5A78A0E4;SOID=4658AA30;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=0;SY=-2;EX=0;EY=-2;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=90:CY=14:OX=7: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=2A1F793A;SOID=6E491AEE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=39;SY=35;EX=-1;EY=-16;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_04EC0265_2665_47d4_AEDA_E49049545B3B" style="Mode=3;EOID=4658AA30;SOID=6E491AEE;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=86;SY=-1;EX=-2;EY=-1;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=88:CY=14:OX=-1: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_C3BED690_3A74_4118_8357_6957359310FB" style="Mode=3;EOID=81991C44;SOID=6E491AEE;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=54:OY=-17:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17: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_B62DE754_3523_45c7_9426_333EF3B4B423" style="Mode=3;EOID=29942A51;SOID=81991C44;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=1;SY=34;EX=1;EY=-34;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8210E652_8F84_48dd_BE0E_772ACFDB16C5" style="Mode=3;EOID=8A5C4834;SOID=81991C44;Color=-1;LWidth=0;Hidden=0;"/>
+				</elements>
+			</diagram>
 			<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"/>
@@ -47368,9 +49721,9 @@
 			<diagram xmi:id="EAID_6C96B347_4D8D_4680_93BF_AB428ACDC4C3">
 				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" localID="463" owner="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" tpos="3"/>
 				<properties name="dynamic purchasing system" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-05-24 13:26:25" modified="2023-06-28 11:09:50"/>
+				<project author="andreea" version="1.0" created="2023-05-24 13:26:25" modified="2023-09-11 17:48: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=F00E1F69;"/>
+				<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=7A57E5D4;"/>
 				<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/>
@@ -47384,9 +49737,9 @@
 					<element geometry="Left=901;Top=51;Right=1120;Bottom=110;" subject="EAID_D787981E_DCA2_40b3_83AA_6740E666BCB4" 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=3451B1EA;"/>
 					<element geometry="Left=888;Top=244;Right=1135;Bottom=293;" subject="EAID_87CEFE23_FABD_41fc_8BC0_71EA7F9C3122" 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=6D20985C;"/>
 					<element geometry="Left=1154;Top=245;Right=1245;Bottom=294;" subject="EAID_715A3156_5F19_4b35_B5F3_1BED9F96AB90" 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=B09EE906;"/>
-					<element geometry="Left=371;Top=760;Right=552;Bottom=830;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="10" style="DUID=59845ADA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=856;Top=660;Right=946;Bottom=703;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="11" style="DUID=BA50DDF2;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=667;Top=760;Right=781;Bottom=830;" subject="EAID_6966846F_842F_4149_A95B_AE374D603608" seqno="12" style="DUID=B1F7726A;"/>
+					<element geometry="Left=371;Top=737;Right=552;Bottom=807;" subject="EAID_116B30E9_5947_4510_847A_7E8C5EEC0432" seqno="10" style="DUID=59845ADA;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=687;Top=647;Right=777;Bottom=690;" subject="EAID_30C7F5B2_52F8_43ec_ADAC_88A2D6017C32" seqno="11" style="DUID=BA50DDF2;NSL=0;BCol=-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=737;Right=789;Bottom=807;" subject="EAID_6966846F_842F_4149_A95B_AE374D603608" seqno="12" style="DUID=B1F7726A;"/>
 					<element geometry="Left=140;Top=638;Right=230;Bottom=698;" subject="EAID_20196F1A_F4F1_4faf_B4B3_B5CED1D24AF2" seqno="13" style="DUID=4B391234;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=373;Top=633;Right=550;Bottom=703;" subject="EAID_C06EA401_3F55_4448_B4FF_BB7EA510A155" seqno="14" style="DUID=F8513F44;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=375;Top=510;Right=546;Bottom=580;" subject="EAID_3780AA50_D898_4068_B300_47B46651CA0A" seqno="15" style="DUID=B90810F1;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -47401,10 +49754,10 @@
 					<element geometry="EDGE=2;EX=-28;EY=0;SX=0;SY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=41: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=711:-222$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=A2B10EA1;SOID=CB8FEBDE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=0;EX=0;EY=11;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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=744:-69$;" subject="EAID_691AA305_6E1E_4123_A7F5_548146C45BC4" style="Mode=3;EOID=3451B1EA;SOID=A2B10EA1;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=EA7F0A21;SOID=A2B10EA1;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EX=0;EY=-2;SX=0;SY=-25;EDGE=4;$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=-4:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=122:-570$122:-797$;" subject="EAID_DE5098A6_B134_4261_8994_841365A27FAB" style="Mode=3;EOID=59845ADA;SOID=B90810F1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=-2;SX=0;SY=-25;EDGE=4;$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=-4:OY=7:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=122:-570$122:-774$;" subject="EAID_DE5098A6_B134_4261_8994_841365A27FAB" style="Mode=3;EOID=59845ADA;SOID=B90810F1;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=4;$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_C3F5DF0E_730A_416e_9244_87A3BCAC0065" style="Mode=3;EOID=4B391234;SOID=F8513F44;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="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_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=A2B10EA1;SOID=84F550A3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=33;EX=0;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55: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=901:-762$;" subject="EAID_007753B6_365D_4082_8CC4_DA85F79E7124" style="Mode=3;EOID=BA50DDF2;SOID=B1F7726A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=33;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97:CY=14:OX=55: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_007753B6_365D_4082_8CC4_DA85F79E7124" style="Mode=3;EOID=BA50DDF2;SOID=B1F7726A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=-2;EY=0;SX=-45;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83:CY=14:OX=41: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_ADE68ED4_8A73_411c_B751_1F0998CC86A7" style="Mode=3;EOID=B90810F1;SOID=EA7F0A21;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=0;EY=7;SX=4;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1203:-172$;" subject="EAID_B158E1D7_3CC5_4e64_8D25_C40F0E038224" style="Mode=3;EOID=04FFA301;SOID=B09EE906;Color=-1;LWidth=0;TREE=OR;Hidden=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_AFFFCDAE_C459_4420_9649_6F7949D3D9BA" style="Mode=3;EOID=EA7F0A21;SOID=2E2B20D7;Color=-1;LWidth=0;Hidden=0;"/>
@@ -47414,16 +49767,16 @@
 					<element geometry="SX=-9;SY=0;EX=0;EY=-17;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=811:-97$;" subject="EAID_E51D25BC_E9FB_423c_BFBF_00E3B99864B4" style="Mode=3;EOID=3451B1EA;SOID=4AE6C3D5;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_03FC1FD2_BDF5_4ae5_8D8D_679E9486EE84" style="Mode=3;EOID=3451B1EA;SOID=04FFA301;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=4;SY=0;EX=0;EY=1;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1416:-79$;" subject="EAID_E006DB35_535D_4444_B447_89D7A813874C" style="Mode=3;EOID=3451B1EA;SOID=401F99B9;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=6;SY=0;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146: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=4:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1419:-789$;" subject="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C" style="Mode=3;EOID=B1F7726A;SOID=DDB20466;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=6;SY=0;EX=0;EY=6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146: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=4:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1419:-766$;" subject="EAID_0EF2D4DC_7ED0_457c_8310_43761AC8295C" style="Mode=3;EOID=B1F7726A;SOID=DDB20466;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_4817E610_079C_4b0d_A7C8_604097CB9B2E" style="Mode=3;EOID=B90810F1;SOID=F8513F44;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_CB9AE4FA_A6CB_4260_A662_9286DF2785D7">
 				<model package="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" localID="464" owner="EAPK_8E7CCB8A_70DE_4968_ADF7_A3665D04BE4C" tpos="4"/>
 				<properties name="framework agreement" type="Logical"/>
-				<project author="andreea" version="1.0" created="2023-05-24 14:26:36" modified="2023-06-28 11:10:21"/>
+				<project author="andreea" version="1.0" created="2023-05-24 14:26:36" modified="2023-09-11 17:49: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=FCD39C46;"/>
+				<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=BDB0CD03;"/>
 				<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/>
@@ -47452,7 +49805,7 @@
 					<element geometry="SX=1;SY=0;EX=-5;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=96:CY=14:OX=55: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=1277:-677$1095:-677$;" subject="EAID_D68065CA_2D18_479d_95EB_23D106ED6921" style="Mode=3;EOID=BD213EDD;SOID=FA7323CE;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=177:CY=27:OX=14: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=;" subject="EAID_FF75C037_BE4C_49d2_A743_BAD5FFBD3003" style="Mode=3;EOID=1BDBD11E;SOID=FA7323CE;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_B8BA8A30_8A22_4475_A8A7_C0037581B6D3" style="Mode=3;EOID=9E30BF30;SOID=78C9F46D;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=2;EX=-26;EY=0;SX=0;SY=-6;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=41:OY=-44: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=715:-215$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=4959EE36;SOID=78C9F46D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;EX=-28;EY=0;SX=0;SY=-7;$LLB=;LLT=;LMT=;LMB=;LRT=CX=171:CY=14:OX=60:OY=-36: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=713:-216$;" subject="EAID_D9990D3C_51ED_4626_9195_C96F98BD3349" style="Mode=3;EOID=4959EE36;SOID=78C9F46D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="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=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_15CFA3D8_50E1_40f7_8F66_FA023FA190E7" style="Mode=3;EOID=4959EE36;SOID=3E14F853;Color=-1;LWidth=0;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=9E30BF30;SOID=4959EE36;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=1;SX=14;SY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=83: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=503:-584$;" subject="EAID_ADE68ED4_8A73_411c_B751_1F0998CC86A7" style="Mode=3;EOID=3717091D;SOID=9E30BF30;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -47470,9 +49823,9 @@
 			<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="2023-06-28 11:09:52"/>
+				<project author="andreea" version="1.0" created="2023-05-24 14:38:17" modified="2023-09-11 17:48: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;"/>
-				<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=454A7250;"/>
+				<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=1E482DA0;"/>
 				<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/>
@@ -47487,30 +49840,28 @@
 					<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;"/>
-					<element geometry="SX=-98;SY=1;EX=-97;EY=1;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192:CY=14:OX=181:OY=-189: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_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=27;EX=0;EY=5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=1136:-262$1136:-726$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=9C99D9AD;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-18;EDGE=2;EX=-88;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155: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=-1:OY=6: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=C9A9B5B0;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=45;EX=0;EY=-30;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1156:-244$1156:-761$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=9C99D9AD;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-1;SY=52;EX=-1;EY=-15;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126:CY=14:OX=151:OY=-5: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=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" style="Mode=3;EOID=893457AA;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=2;SY=0;EX=0;EY=-47;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=861:-336$;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=D42AD2D4;SOID=5DDB9FE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=1;SY=-3;EX=1;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89: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=16:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0" style="Mode=3;EOID=619149A5;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-37;SY=-30;EX=-35;EY=47;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=125:OY=-154: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=582:-562$;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=0;EY=-36;SX=9;SY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=195:CY=14:OX=-8: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=329:-325$;" subject="EAID_F5BE64C7_3F6B_4881_AB89_9342AF882E95" style="Mode=3;EOID=D42AD2D4;SOID=5CE6B36A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=106;SY=-2;EX=107;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=179:OY=-189: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_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=32;SY=-6;EX=33;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=183:OY=-193: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_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-25;SY=1;EX=9;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=77: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_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=D42AD2D4;SOID=10CDB39A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-3;SY=12;EX=-3;EY=-31;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-7: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_4557D84E_2B82_485f_A14D_2E0BE4C98649" style="Mode=3;EOID=10CDB39A;SOID=599DFC51;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=0;EY=7;SX=-30;SY=0;EDGE=3;$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=290:-724$;" subject="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" style="Mode=3;EOID=9C99D9AD;SOID=5CE6B36A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EX=0;EY=-27;SX=-62;SY=0;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=258:-758$;" subject="EAID_3127E296_9886_44bc_86E7_B4E433F87208" style="Mode=3;EOID=9C99D9AD;SOID=5CE6B36A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EX=0;EY=7;SX=-30;SY=0;EDGE=3;$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=290:-724$;" subject="EAID_98D513D4_9622_4217_94D7_26E6E451AF0C" style="Mode=3;EOID=9C99D9AD;SOID=5CE6B36A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-3;SY=12;EX=-3;EY=-31;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=-7: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_4557D84E_2B82_485f_A14D_2E0BE4C98649" style="Mode=3;EOID=10CDB39A;SOID=599DFC51;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-25;SY=1;EX=9;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=127:CY=14:OX=77: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_CF215D61_0282_4111_B11C_CBD651205C58" style="Mode=3;EOID=D42AD2D4;SOID=10CDB39A;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=32;SY=-6;EX=33;EY=-6;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203:CY=14:OX=183:OY=-193: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_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=106;SY=-2;EX=107;EY=-2;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193:CY=14:OX=179:OY=-189: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_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=9C99D9AD;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EX=-18;EY=2;SX=18;SY=30;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F241B2E1_47C3_4512_8EBE_A60BD8ED070A" style="Mode=3;EOID=D42AD2D4;SOID=54EF8080;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=2;SY=0;EX=0;EY=-47;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=861:-336$;" subject="EAID_36C907D3_6701_4489_9BBA_3C0E1D4E25A8" style="Mode=3;EOID=D42AD2D4;SOID=5DDB9FE8;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=52;EX=-1;EY=-15;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=126: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=3:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_C9140D6A_9EC6_4bc0_B489_096BF3AE570A" style="Mode=3;EOID=893457AA;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=45;EX=0;EY=-30;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=97: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=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1156:-244$1156:-761$;" subject="EAID_547A511C_F377_4405_82EA_14ABA20458B6" style="Mode=3;EOID=9C99D9AD;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-18;EDGE=2;EX=-88;EY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155: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=-1:OY=6: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=C9A9B5B0;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=27;EX=0;EY=5;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=87: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=1136:-262$1136:-726$;" subject="EAID_D257E7B8_BA32_4888_BB1A_167306D6B16C" style="Mode=3;EOID=9C99D9AD;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=1;SY=-3;EX=1;EY=-1;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=89: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=16:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_50DC56C3_14A4_46c6_BCAE_F8C1CC7880E0" style="Mode=3;EOID=619149A5;SOID=D42AD2D4;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<diagram xmi:id="EAID_5C2AE103_DF65_4cef_9BB7_4551850E9016">
 				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" localID="309" owner="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" tpos="2"/>
 				<properties name="contextual information" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-03-18 11:49:02" modified="2023-07-17 17:12:14"/>
+				<project author="andreea" version="1.0" created="2022-03-18 11:49:02" modified="2023-08-17 16:50:39"/>
 				<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=99509245;"/>
+				<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=D58207AE;"/>
 				<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/>
@@ -47550,9 +49901,9 @@
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C3A36A4B_DBA9_4b46_B3E4_2E8899DEDCE9" style="Mode=3;EOID=F7904FC5;SOID=36D654C8;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=155: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=0:OY=0: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=9835D121;SOID=36D654C8;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_5ACD6A3D_7AA3_4504_8B13_015B01092BC2" style="Mode=3;EOID=7584623A;SOID=112477EF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=0;EX=0;EY=0;Path=;" subject="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" style=";Hidden=0;"/>
+					<element geometry="SX=-72;SY=0;EX=-2;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1853:-35$992:-35$;" subject="EAID_7D7F08FC_F309_4a60_B76D_8B1B3FFE038A" style="Mode=3;EOID=7584623A;SOID=59BB12BA;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_5C3A7045_BE74_49aa_ADDD_37AEDF27D9E0" style="Mode=3;EOID=7584623A;SOID=EB99D760;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="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_3FEA813D_50A9_4b54_8B7C_0A19B505F52F" style="Mode=3;EOID=59BB12BA;SOID=210970B3;Color=-1;LWidth=0;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=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_3FEA813D_50A9_4b54_8B7C_0A19B505F52F" style="Mode=3;EOID=210970B3;SOID=59BB12BA;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=-19;SY=0;EX=0;EY=3;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=195:CY=14:OX=118:OY=-40: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_F5BE64C7_3F6B_4881_AB89_9342AF882E95" style="Mode=3;EOID=36D654C8;SOID=63193225;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-8;SY=-51;EX=-8;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=139: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_6E3C7B53_979C_4020_95DB_31C0DA62F564" style="Mode=3;EOID=CD1122E7;SOID=63193225;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=62;EX=0;EY=-2;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=435:-546$435:-143$;" subject="EAID_31D3A42A_B28E_449d_AF5F_9D6CCD87E6A1" style="Mode=3;EOID=0B23E176;SOID=63193225;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
@@ -47565,7 +49916,7 @@
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=124:CY=14:OX=67: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_24ED3FAD_FABC_4b24_A3E6_B0420EB7CF2A" style="Mode=3;EOID=EDE8F818;SOID=9835D121;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=1465;SCTR.TOP=-106;SCTR.RIGHT=1496;SCTR.BOTTOM=-66;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=75:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=1496:-86$1496:-66$1465:-66$1465:-86$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=210970B3;SOID=210970B3;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_C1CAAF14_976F_4d28_938A_6ECEC8F64316" style="Mode=3;EOID=7584623A;SOID=D5895CB3;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=-62;SY=-4;EX=-62;EY=-4;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=140:CY=14:OX=87: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_CF14464A_EF1A_4230_BB7E_A40906D6ED97" style="Mode=3;EOID=A89D9F2F;SOID=210970B3;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SX=-62;SY=-4;EX=-62;EY=-4;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=87: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_CF14464A_EF1A_4230_BB7E_A40906D6ED97" style="Mode=3;EOID=210970B3;SOID=A89D9F2F;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=D5895CB3;SOID=F877791C;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=78;SY=-13;EX=31;EY=-9;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=49:OY=31: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_7E3AE348_60D1_44cb_BC5F_08B65291C2AC" style="Mode=3;EOID=210970B3;SOID=A89D9F2F;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_450148E7_98E2_4642_9EE2_203242F5A4D8" style="Mode=3;EOID=7584623A;SOID=28CA00E4;Color=-1;LWidth=0;Hidden=0;"/>
@@ -47634,15 +49985,15 @@
 			<diagram xmi:id="EAID_F9A67D0E_2ACB_45b8_833F_A797EB7E372E">
 				<model package="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" localID="351" owner="EAPK_A1BB437B_AD73_4f28_B11F_4B624C467CDA" tpos="3"/>
 				<properties name="procurement process information" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-07-07 11:50:56" modified="2023-07-13 07:13:21"/>
+				<project author="lps" version="1.0" created="2022-07-07 11:50:56" modified="2023-08-17 16:46: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=8AF2AC6F;"/>
+				<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=C81F9766;"/>
 				<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=147;Top=323;Right=434;Bottom=433;" subject="EAID_8F3A6A54_584E_4f65_80B0_0C345D6703F4" seqno="1" style="DUID=E2105741;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=606;Top=219;Right=714;Bottom=289;" subject="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" 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=F24A0FCA;"/>
+					<element geometry="Left=592;Top=254;Right=728;Bottom=289;" subject="EAID_75C399EB_16A2_42ee_8C71_E7FB3B4F88F0" 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=F24A0FCA;"/>
 					<element geometry="Left=168;Top=94;Right=413;Bottom=244;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" seqno="3" style="DUID=70C45448;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=204;Top=495;Right=377;Bottom=557;" subject="EAID_31976DD6_F85A_4940_AC62_FA4769B4D88C" seqno="4" style="DUID=9654569A;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=549;Top=341;Right=771;Bottom=416;" subject="EAID_1062E1ED_D094_425e_B51B_9E700090C968" seqno="5" style="DUID=7F097BF2;"/>
@@ -47658,41 +50009,43 @@
 			<diagram xmi:id="EAID_83ABA0C5_B381_42ca_95E8_78D3C1611815">
 				<model package="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" localID="208" owner="EAPK_E19AEFF3_60AD_4531_8112_3046FA0BBC58" tpos="1"/>
 				<properties name="documents hierarchy" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-01-11 10:36:47" modified="2023-07-13 07:21:08"/>
+				<project author="andreea" version="1.0" created="2022-01-11 10:36:47" modified="2023-09-11 17:51:04"/>
 				<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=B8032487;"/>
+				<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=210F784A;"/>
 				<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=911;Top=356;Right=1026;Bottom=384;" subject="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" seqno="1" style="DUID=B66C53C5;NSL=0;BCol=-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=192;Right=1381;Bottom=262;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="2" style="DUID=2BC3D9CD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1040;Top=138;Right=1256;Bottom=208;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" seqno="2" style="DUID=2BC3D9CD;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=902;Top=526;Right=1140;Bottom=627;" subject="EAID_F3C0E775_3943_40b1_B59A_3107FF9B30BC" seqno="3" style="NSL=0;DUID=CC002D22;"/>
 					<element geometry="Left=524;Top=411;Right=797;Bottom=473;" 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=2A1C915C;"/>
 					<element geometry="Left=807;Top=411;Right=1010;Bottom=473;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="5" style="NSL=0;DUID=4F2073E3;"/>
 					<element geometry="Left=715;Top=526;Right=889;Bottom=596;" subject="EAID_86BEE806_DF2C_4395_95C9_B8B685B22E32" seqno="6" style="NSL=0;DUID=E719BE2A;"/>
-					<element geometry="Left=434;Top=311;Right=653;Bottom=373;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=9CC7ED49;"/>
+					<element geometry="Left=435;Top=322;Right=654;Bottom=384;" subject="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" 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=9CC7ED49;"/>
 					<element geometry="Left=1049;Top=234;Right=1139;Bottom=268;" subject="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" seqno="8" style="DUID=B6086309;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1050;Top=356;Right=1175;Bottom=384;" subject="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" 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=1AE656DB;"/>
-					<element geometry="Left=339;Top=227;Right=353;Bottom=241;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="10" style="DUID=0833A7E2;"/>
-					<element geometry="Left=690;Top=339;Right=815;Bottom=367;" subject="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" 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=02CFB55B;"/>
-					<element geometry="Left=599;Top=71;Right=786;Bottom=208;" 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=DC590000;"/>
-					<element geometry="Left=1040;Top=291;Right=1165;Bottom=319;" subject="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" 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=63938091;"/>
-					<element geometry="Left=71;Top=214;Right=316;Bottom=367;" 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=FA081B1E;"/>
-					<element geometry="Left=597;Top=34;Right=611;Bottom=48;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="15" style="DUID=5D7126E8;"/>
-					<element geometry="Left=230;Top=395;Right=421;Bottom=428;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" 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=130D3A31;"/>
-					<element geometry="SX=-1;SY=-1;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" style="Mode=3;EOID=DC590000;SOID=B66C53C5;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="Left=1050;Top=356;Right=1175;Bottom=411;" subject="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" 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=1AE656DB;"/>
+					<element geometry="Left=232;Top=467;Right=419;Bottom=497;" subject="EAID_F5AE8AA9_91EE_4cb3_AE98_14D4AF1A77C1" 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=EB21B823;"/>
+					<element geometry="Left=376;Top=221;Right=390;Bottom=235;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="11" style="DUID=0833A7E2;"/>
+					<element geometry="Left=690;Top=339;Right=815;Bottom=367;" subject="EAID_A91B204C_7A0E_4608_A8D0_545E069052CC" 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=02CFB55B;"/>
+					<element geometry="Left=599;Top=71;Right=794;Bottom=208;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" 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=DC590000;"/>
+					<element geometry="Left=1040;Top=291;Right=1165;Bottom=319;" subject="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" 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=63938091;"/>
+					<element geometry="Left=108;Top=208;Right=353;Bottom=361;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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=FA081B1E;"/>
+					<element geometry="Left=597;Top=34;Right=611;Bottom=48;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="16" style="DUID=5D7126E8;"/>
+					<element geometry="Left=230;Top=395;Right=421;Bottom=428;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" 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=130D3A31;"/>
+					<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=DC590000;SOID=2BC3D9CD;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=569;SCTR.TOP=-88;SCTR.RIGHT=639;SCTR.BOTTOM=-41;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=65:OY=-45:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=639:-71$639:-41$569:-41$569:-88$599:-88$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=DC590000;SOID=DC590000;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=785;SCTR.TOP=-142;SCTR.RIGHT=817;SCTR.BOTTOM=-117;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=134:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=786:-142$817:-142$817:-117$786:-117$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=DC590000;SOID=DC590000;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=785;SCTR.TOP=-142;SCTR.RIGHT=817;SCTR.BOTTOM=-117;$LLB=;LLT=;LMT=;LMB=;LRT=CX=119:CY=14:OX=134:OY=29:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=794:-142$817:-142$817:-117$794:-117$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=DC590000;SOID=DC590000;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=2;SY=-5;EX=2;EY=-9;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_DCD1791D_6597_41ef_AB35_766470760473" style="Mode=3;EOID=DC590000;SOID=63938091;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;SX=-1;SY=1;EX=1;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=FA081B1E;SOID=FA081B1E;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=46;SY=23;EX=-7;EY=-7;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A6577BAD_B1CB_4608_94A0_32241C0F50CE" style="Mode=3;EOID=DC590000;SOID=FA081B1E;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;EX=-16;EY=13;SX=-15;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=DC590000;SOID=130D3A31;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=1;EX=1;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7CBD3DD0_176F_4d6c_8821_DE0368FF9C47" style="Mode=3;EOID=DC590000;SOID=02CFB55B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;SX=1;SY=-1;EX=93;EY=-61;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_F547C226_B690_4b64_9C04_7ED2CC31BA99" style="Mode=3;EOID=DC590000;SOID=1AE656DB;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=752;SCTR.TOP=-100;SCTR.RIGHT=815;SCTR.BOTTOM=-46;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=117:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=786:-100$815:-100$815:-46$752:-46$752:-71$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=DC590000;SOID=DC590000;Color=-1;LWidth=0;Hidden=0;"/>
-					<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=DC590000;SOID=2BC3D9CD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=2;SCTR.LEFT=752;SCTR.TOP=-100;SCTR.RIGHT=815;SCTR.BOTTOM=-46;$LLB=;LLT=;LMT=;LMB=;LRT=CX=109:CY=14:OX=117:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=794:-100$815:-100$815:-46$752:-46$752:-71$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=DC590000;SOID=DC590000;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=9CC7ED49;SOID=2BC3D9CD;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="SX=-67;SY=0;EX=65;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_2C3C6FFD_7F77_424c_B8A1_C090490D5878" style="Mode=3;EOID=4F2073E3;SOID=CC002D22;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-1;SY=-1;EX=0;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_8521EFF6_74EA_47a5_BE12_0A7FCD4C34D2" style="Mode=3;EOID=DC590000;SOID=B66C53C5;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=4;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=DC590000;SOID=B6086309;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=7;SY=-7;EX=7;EY=-7;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=1;EOID=5D7126E8;SOID=0833A7E2;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_B0961C3B_3C3E_4c2a_A3F4_443665C43EB4" style="Mode=3;EOID=DC590000;SOID=9CC7ED49;Color=-1;LWidth=0;Hidden=0;"/>
@@ -47701,39 +50054,40 @@
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=899;SCTR.TOP=-428;SCTR.RIGHT=998;SCTR.BOTTOM=-373;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=998:-411$998:-373$899:-373$899:-411$;" subject="EAID_4C33CDC7_EDE9_461d_85E1_1ABB6B9E21EB" style="Mode=3;EOID=4F2073E3;SOID=4F2073E3;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=DC590000;SOID=4F2073E3;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_A1934B85_FC19_4477_B74D_B5F732EECD28" style="Mode=3;EOID=DC590000;SOID=2A1C915C;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_EEE75552_13BB_48c2_A5D7_18A876BF10CF" style="Mode=3;EOID=9CC7ED49;SOID=2BC3D9CD;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_A00448A7_8270_497c_9895_20BF2C6316EF" style="Mode=3;EOID=130D3A31;SOID=EB21B823;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
 			<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-07-17 17:36:11"/>
+				<project author="andreea" version="1.0" created="2022-04-26 15:13:18" modified="2023-09-01 18:11: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=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=C2E186CA;"/>
+				<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;"/>
 				<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=1130;Top=373;Right=1245;Bottom=401;" subject="EAID_23E9784F_4AEE_4484_9BAC_28A7FEB05838" 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=64010528;"/>
-					<element geometry="Left=1257;Top=330;Right=1473;Bottom=400;" subject="EAID_76E69B0B_4A6E_4901_8372_75A07B6AB066" 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=624B89A7;"/>
-					<element geometry="Left=902;Top=755;Right=1175;Bottom=817;" subject="EAID_B7007F0A_6B30_4fc5_8AC2_D7789CCFB7F8" 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=D92E6D3F;"/>
-					<element geometry="Left=1055;Top=651;Right=1258;Bottom=713;" subject="EAID_A38528E5_97D5_4522_BEC9_90381AD6D4F1" seqno="4" style="NSL=0;DUID=E6D49A5D;"/>
-					<element geometry="Left=423;Top=671;Right=642;Bottom=733;" 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=F696E1E8;"/>
-					<element geometry="Left=635;Top=466;Right=725;Bottom=500;" subject="EAID_3A843EBF_E4B4_48cd_A912_95FF3EA9C6FF" 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=7F2BB6AE;"/>
-					<element geometry="Left=91;Top=492;Right=181;Bottom=606;" subject="EAID_844D47AF_2CFC_4482_AB49_BF3DDBFF4E66" seqno="7" 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="8" style="DUID=75363133;"/>
-					<element geometry="Left=656;Top=212;Right=670;Bottom=226;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="9" style=" DUID=194C68AE;"/>
-					<element geometry="Left=635;Top=505;Right=649;Bottom=519;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="10" style=" DUID=C644E86F;"/>
-					<element geometry="Left=367;Top=492;Right=612;Bottom=632;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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=5CE44B2A;"/>
-					<element geometry="Left=1165;Top=500;Right=1270;Bottom=547;" subject="EAID_F72FB743_EDB9_4511_9787_B6F389BACA6B" 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=629DEC99;"/>
-					<element geometry="Left=1257;Top=226;Right=1473;Bottom=312;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="13" 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="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=42B7986B;"/>
-					<element geometry="Left=445;Top=386;Right=535;Bottom=438;" subject="EAID_92EBF0F3_11DB_43d4_A283_99A69DAB2E4A" seqno="15" style="DUID=CF3FA725;"/>
-					<element geometry="Left=693;Top=181;Right=955;Bottom=386;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" 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=0202DC86;"/>
-					<element geometry="Left=1174;Top=438;Right=1264;Bottom=485;" subject="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" 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=571B4B3F;"/>
-					<element geometry="Left=692;Top=632;Right=956;Bottom=733;" subject="EAID_75BCD9B6_2430_48ad_9EC7_90D2BE971F58" seqno="18" 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=423;Top=258;Right=513;Bottom=346;" subject="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" seqno="19" 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="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=59D172A9;"/>
+					<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=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=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=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;"/>
+					<element geometry="Left=1174;Top=438;Right=1264;Bottom=485;" subject="EAID_78F4538F_91BE_488b_A5D5_16A78AB06A11" 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=571B4B3F;"/>
+					<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="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;"/>
@@ -47748,19 +50102,19 @@
 					<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="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=0;SY=-31;EX=0;EY=-44;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=142: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_BFB6D7D9_0F2B_47c4_8AD5_971C71230DCF" style="Mode=3;EOID=64F017B9;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=4;SCTR.LEFT=663;SCTR.TOP=-244;SCTR.RIGHT=696;SCTR.BOTTOM=-194;$LLB=;LLT=;LMT=;LMB=;LRT=CX=103:CY=14:OX=5:OY=-12:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=0:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=693:-194$663:-194$663:-244$693:-244$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=0202DC86;SOID=0202DC86;Color=-1;LWidth=0;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=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=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_3A1B9223_B1D3_4ffe_B219_FFD9D57F9B43" style="Mode=3;EOID=59D172A9;SOID=A2664700;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=0;SY=-7;EX=-7;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=656:-519$;" 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=2;SX=-1;SY=1;EX=1;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=5CE44B2A;SOID=5CE44B2A;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SX=17;SY=57;EX=5;EY=39;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=11;SY=4;EX=0;EY=0;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=1;SX=4;SY=1;EX=4;EY=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=79: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_F337974A_F4B7_4be6_BD98_F885B35FD24B" style="Mode=3;EOID=CF3FA725;SOID=5CE44B2A;Color=-1;LWidth=0;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="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="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;"/>
 				</elements>
 			</diagram>
@@ -47849,8 +50203,6 @@
 					<element geometry="Left=435;Top=47;Right=733;Bottom=117;" subject="EAID_48AED17D_D6F4_484c_B2BD_3FD3B49365EE" 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=7ABB3C5B;"/>
 					<element geometry="SX=0;SY=-34;EX=0;EY=45;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=203: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=1291:-581$1291:-154$;" subject="EAID_8E7619CE_95A4_4f77_A6DC_62DFC84C122D" style="Mode=3;EOID=DDADB2C0;SOID=E1C42E35;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=13;EX=0;EY=-25;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=193: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=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1239:-534$1239:-224$;" subject="EAID_1E87247C_598C_4f96_8D8A_71BD69D25161" style="Mode=3;EOID=DDADB2C0;SOID=E1C42E35;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=-12;EX=0;EY=10;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=192: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=1266:-559$1266:-189$;" subject="EAID_8E718222_A67E_4d16_8978_7B6F899FD855" style="Mode=3;EOID=DDADB2C0;SOID=E1C42E35;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=0;SY=36;EX=0;EY=-58;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137: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=2:OY=5:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1216:-511$1216:-257$;" subject="EAID_1729B069_584F_4a4f_910B_A28B233CEB46" style="Mode=3;EOID=DDADB2C0;SOID=E1C42E35;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_AAE5061F_F0FE_4ca1_8447_5E708FAB9D5A" style="Mode=3;EOID=0ED542A6;SOID=F8E9C11B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=146: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_A96B5FDE_85B9_4435_B7E7_D176E6996280" style="Mode=3;EOID=E1C42E35;SOID=F8E9C11B;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=117: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_D7964CE9_B09A_4855_B489_34E46CFF8E24" style="Mode=3;EOID=DDADB2C0;SOID=D856E4B0;Color=-1;LWidth=0;Hidden=0;"/>
@@ -47914,32 +50266,34 @@
 			<diagram xmi:id="EAID_44A1640B_919A_4ad4_8024_B556ACED19B4">
 				<model package="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" localID="317" owner="EAPK_9E50A3E6_B9A2_4bb3_A39F_154425D8333D" tpos="3"/>
 				<properties name="change specification relations" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-04-05 14:21:09" modified="2023-07-17 17:57:42"/>
+				<project author="lps" version="1.0" created="2022-04-05 14:21:09" modified="2023-09-01 16:44: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=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=E26DFACB;"/>
+				<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=7EA5C7C6;"/>
 				<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=129;Top=40;Right=143;Bottom=54;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="1" style=" DUID=9F42FE26;"/>
-					<element geometry="Left=166;Top=231;Right=180;Bottom=245;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="2" style=" DUID=E34E5C50;"/>
-					<element geometry="Left=151;Top=47;Right=335;Bottom=187;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="3" style="DUID=270424FD;NSL=0;BCol=-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=454;Right=348;Bottom=542;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="4" style="DUID=12E8C1E3;NSL=0;BCol=-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=154;Right=751;Bottom=216;" subject="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" seqno="5" style="DUID=935FE042;"/>
-					<element geometry="Left=121;Top=262;Right=366;Bottom=412;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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=71704D56;"/>
-					<element geometry="Left=576;Top=474;Right=739;Bottom=526;" subject="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" seqno="7" style="DUID=637673E6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=515;Top=283;Right=798;Bottom=394;" subject="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" seqno="8" style="DUID=59C2CA69;NSL=0;"/>
+					<element geometry="Left=562;Top=78;Right=753;Bottom=131;" subject="EAID_122536CB_B61F_4219_A56C_6D68CD1BEAF3" 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=D23CA203;"/>
+					<element geometry="Left=124;Top=40;Right=138;Bottom=54;" subject="EAID_6288458C_4439_46bc_A898_C99A5E4A62D6" seqno="2" style=" DUID=9F42FE26;"/>
+					<element geometry="Left=166;Top=231;Right=180;Bottom=245;" subject="EAID_AC8CC935_389B_479b_B0EA_B6FB8B5C8EB6" seqno="3" style=" DUID=E34E5C50;"/>
+					<element geometry="Left=146;Top=47;Right=341;Bottom=187;" subject="EAID_91FCDF9A_77D0_4ad5_B217_37E957B3B448" seqno="4" style="DUID=270424FD;NSL=0;BCol=-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=454;Right=348;Bottom=542;" subject="EAID_ECF07FF0_8693_499d_AD7B_7484B8FDA398" seqno="5" style="DUID=12E8C1E3;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=563;Top=200;Right=750;Bottom=262;" subject="EAID_98639C30_5207_4cc7_B47E_50C11AD87033" seqno="6" style="DUID=935FE042;"/>
+					<element geometry="Left=121;Top=262;Right=366;Bottom=412;" subject="EAID_67E2E371_0A7D_4004_B8A4_6F969F59938C" 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=71704D56;"/>
+					<element geometry="Left=576;Top=474;Right=739;Bottom=526;" subject="EAID_486D9684_7132_41d3_A94D_8DC872AE93F7" seqno="8" style="DUID=637673E6;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=515;Top=282;Right=798;Bottom=393;" subject="EAID_1581E35D_DDC7_45a6_9D1A_0FFBB894F5CC" seqno="9" style="DUID=59C2CA69;NSL=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3C3D734E_D8F1_460f_934C_F1F1D556AA5A" style="Mode=3;EOID=59C2CA69;SOID=935FE042;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SX=2;SY=-22;EX=2;EY=-22;EDGE=4;SCME=0;SCTR=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=84:CY=14:OX=18: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=;" subject="EAID_CF14464A_EF1A_4230_BB7E_A40906D6ED97" style="Mode=3;EOID=71704D56;SOID=59C2CA69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="SX=-96;SY=0;EX=0;EY=0;EDGE=3;$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=560:-498$;" subject="EAID_84490705_94B3_445f_ACA6_A903591C3651" style="Mode=3;EOID=12E8C1E3;SOID=59C2CA69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=-96;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=152: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=560:-498$;" subject="EAID_84490705_94B3_445f_ACA6_A903591C3651" style="Mode=3;EOID=12E8C1E3;SOID=59C2CA69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-6;SY=45;EX=-6;EY=3;EDGE=4;$LLB=;LLT=;LMT=;LMB=;LRT=CX=116:CY=14:OX=17: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_7E3AE348_60D1_44cb_BC5F_08B65291C2AC" style="Mode=3;EOID=71704D56;SOID=59C2CA69;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="EDGE=3;SX=0;SY=0;$LLB=;LLT=;LMT=;LMB=;LRT=CX=114:CY=14:OX=67:OY=-18: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_B2FED202_9ACA_415c_B2AB_A1E3E26E726C" style="Mode=3;EOID=637673E6;SOID=59C2CA69;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=270424FD;SOID=71704D56;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=141;SCTR.TOP=-268;SCTR.RIGHT=205;SCTR.BOTTOM=-238;$LLB=;LLT=;LMT=;LMB=;LRT=CX=100:CY=14:OX=88:OY=-20:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=;IRHS=;ILHS=;Path=205:-262$205:-238$141:-238$141:-262$;" subject="EAID_7EE70932_F57C_4861_BE52_91F3F7270840" style="Mode=3;EOID=71704D56;SOID=71704D56;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="EDGE=4;EX=-16;EY=13;SX=-15;SY=-1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_29996CD1_F979_44e0_95A0_E058E0BD5450" style="Mode=3;EOID=270424FD;SOID=D23CA203;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_72F9467C_3D0D_4b12_8FA6_A01D070F8819" style="Mode=3;EOID=9F42FE26;SOID=E34E5C50;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=241;SCTR.TOP=-48;SCTR.RIGHT=256;SCTR.BOTTOM=-17;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=256:-47$256:-17$241:-17$241:-47$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=121;SCTR.TOP=-62;SCTR.RIGHT=152;SCTR.BOTTOM=-47;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=152:-47$152:-47$121:-47$121:-62$151:-62$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
-					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=242;SCTR.TOP=-53;SCTR.RIGHT=296;SCTR.BOTTOM=-26;$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=;IRHS=;ILHS=;Path=296:-47$296:-26$242:-26$242:-47$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=0;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=236;SCTR.TOP=-48;SCTR.RIGHT=251;SCTR.BOTTOM=-17;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=251:-47$251:-17$236:-17$236:-47$;" subject="EAID_7AE6AD20_DD67_4f31_B72E_BC6C99FF3009" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=116;SCTR.TOP=-62;SCTR.RIGHT=147;SCTR.BOTTOM=-47;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=147:-47$147:-47$116:-47$116:-62$146:-62$;" subject="EAID_39F3583F_0D40_4e9f_8018_10297955785C" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
+					<element geometry="SCTR=1;SCME=1;SX=0;SY=0;EX=0;EY=0;EDGE=1;SCTR.LEFT=237;SCTR.TOP=-53;SCTR.RIGHT=291;SCTR.BOTTOM=-26;$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=;IRHS=;ILHS=;Path=291:-47$291:-26$237:-26$237:-47$;" subject="EAID_DFE11A54_45B0_449d_B8FF_34E21440DAD9" style="Mode=3;EOID=270424FD;SOID=270424FD;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_1BEBAC59_19C6_4908_B93C_EED975A6974F" style="Mode=3;EOID=12E8C1E3;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_3AA2C83C_532C_460c_99CE_63F041A42F06" style="Mode=3;EOID=12E8C1E3;SOID=270424FD;Color=-1;LWidth=0;Hidden=1;"/>
 				</elements>
@@ -48017,14 +50371,11 @@
 	<thecustomprofile:NavigationCell base_Class="EAID_03490E2B_19F2_47c3_BE70_0ED3FC280AF1"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_03EE3ECF_9EFF_4bf9_A068_667A0CDFBA55"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_0B563D27_1575_48a5_8CFF_5424B393E918"/>
-	<thecustomprofile:NavigationCell base_Class="EAID_0E2769F1_F27B_445a_A3EA_854B47E10131"/>
-	<thecustomprofile:NavigationCell base_Class="EAID_12170F5C_506A_44bf_A694_24FCCC3FFDA5"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_155C7FA7_6962_4810_AED6_D94302F09660"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_24A53112_91DE_40c0_B978_81AE2B81BF17"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_24F90E61_753D_4cf6_8358_F904A686244F"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_2F3555E6_B9A6_4208_9A19_747532DBC93F"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_307A886F_B089_4e24_95CC_EC9CC2A318DC"/>
-	<thecustomprofile:NavigationCell base_Class="EAID_31EA4D18_AE52_4312_865E_AA3D8CABF489"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_34185A69_499F_47f1_8C0E_32D2FDF93E0A"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_414DE231_616E_4297_80E4_BD39186A377C"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_46C02EA3_5EA6_48ea_9F81_DB71EAB73C34"/>
@@ -48041,8 +50392,6 @@
 	<thecustomprofile:NavigationCell base_Class="EAID_BD29EEFB_4E03_4cf6_AD73_9F36D358A79D"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_BF31E977_E54E_4706_9C28_3C22B15A8113"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_C0FA4596_11C5_4b97_AB06_08AA082CD52B"/>
-	<thecustomprofile:NavigationCell base_Class="EAID_C51CEE38_0715_4c7f_A11A_33482161EFBA"/>
-	<thecustomprofile:NavigationCell base_Class="EAID_D328B002_DFC9_487f_A930_EAEFF23E8568"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_D6C95713_EB11_4af7_8A46_9B20895C7AD2"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_D964D718_09AD_453d_9261_B680435DC8F5"/>
 	<thecustomprofile:NavigationCell base_Class="EAID_DE101954_6101_4316_8883_58912E14D385"/>