diff --git a/src/common/checkers.xsl b/src/common/checkers.xsl
index 851b924..c75f412 100644
--- a/src/common/checkers.xsl
+++ b/src/common/checkers.xsl
@@ -540,6 +540,28 @@
                     $listOfNotDefinedNamespaces"/>
 
     </xsl:function>
+    
+    <xd:doc>
+        <xd:desc>
+            This function checks whether an enumeration has a constraint level property (tag) assigned 
+            and if its value is either "permissive" or "restrictive".
+            
+            The function returns a boolean result:
+            - `true()` if tag exists with the expected property and value.
+            - `false()` if no matching tag is found or if the enumeration has no tags.
+        </xd:desc>
+        <xd:param name="enumeration"/>
+    </xd:doc>
+    <xsl:function name="f:hasEnumerationAConstraintLevelProperty" as="xs:boolean">
+        <xsl:param name="enumeration" as="element()"/>
+        
+        <xsl:variable name="enumerationTags" select="f:getElementTags($enumeration)"/>
+        
+        <xsl:sequence select="
+            some $tag in $enumerationTags
+            satisfies ($tag/@name = $cvConstraintLevelProperty and $tag/@value = ('permissive', 'restrictive'))
+            "/>
+    </xsl:function>
 
 
 
diff --git a/src/html-conventions-lib/dependency-html-conventions.xsl b/src/html-conventions-lib/dependency-html-conventions.xsl
index 84473a1..acaabda 100644
--- a/src/html-conventions-lib/dependency-html-conventions.xsl
+++ b/src/html-conventions-lib/dependency-html-conventions.xsl
@@ -72,9 +72,6 @@
                 <xsl:call-template name="connectorTargetTags">
                     <xsl:with-param name="connector" select="."/>
                 </xsl:call-template>
-                <xsl:call-template name="connectorTags">
-                    <xsl:with-param name="connector" select="."/>
-                </xsl:call-template>
                 <xsl:call-template name="connectorGeneralNameProvided">
                     <xsl:with-param name="connector" select="."/>
                 </xsl:call-template>
diff --git a/src/html-conventions-lib/enumeration-html-conventions.xsl b/src/html-conventions-lib/enumeration-html-conventions.xsl
index 38b650f..258270f 100644
--- a/src/html-conventions-lib/enumeration-html-conventions.xsl
+++ b/src/html-conventions-lib/enumeration-html-conventions.xsl
@@ -103,6 +103,10 @@
                 <xsl:call-template name="enumerationOutgoingConnectors">
                     <xsl:with-param name="enumeration" select="."/>
                 </xsl:call-template>
+            
+            <xsl:call-template name="enumerationConstraintLevel">
+                <xsl:with-param name="enumeration" select="."/>
+            </xsl:call-template>
                 <!--    End of specific checker rules-->
             
         </xsl:variable>
@@ -202,6 +206,30 @@
                 "
         />
     </xsl:template>
+    
+    <xd:doc>
+        <xd:desc>[enumeration-constraint-level-4] he enumeration $value$ does not have a correct constraint level (either permissive or restrictive) set as a tag 
+            with the $cvConstraintLevelProperty$ key. The permissive level will be used as a fallback value. </xd:desc>
+        <xd:param name="enumeration"/>
+    </xd:doc>
+    
+    <xsl:template name="enumerationConstraintLevel">
+        <xsl:param name="enumeration"/>
+        <xsl:sequence
+            select="
+            if (not(f:hasEnumerationAConstraintLevelProperty($enumeration))) then
+            f:generateWarningMessage(fn:concat('The enumeration ', $enumeration/@name,
+            ' does not have a correct constraint level (either permissive or restrictive) set as a tag with the ', $cvConstraintLevelProperty, ' key. The permissive level will be used as a fallback value.'),
+            path($enumeration),
+            'enumeration-constraint-level-4',
+            '',
+            ''
+            )
+            else
+            ()
+            "
+        />
+    </xsl:template>
 
 
    
diff --git a/src/owl-core-lib/descriptors-owl-core.xsl b/src/owl-core-lib/descriptors-owl-core.xsl
index 328dd2c..9c169b2 100644
--- a/src/owl-core-lib/descriptors-owl-core.xsl
+++ b/src/owl-core-lib/descriptors-owl-core.xsl
@@ -99,7 +99,7 @@
         <xsl:param name="tagName"/>
         <xsl:param name="tagValue"/>
         <xsl:param name="elementUri"/>
- <xsl:if test="not($tagName = $statusProperty)">
+        <xsl:if test="not($tagName = $excludedTagNamesList)">
         <rdf:Description rdf:about="{$elementUri}">
         <xsl:choose>
             <xsl:when test="fn:contains($tagName, '@')">
diff --git a/src/shacl-shape-lib/elements-shacl-shape.xsl b/src/shacl-shape-lib/elements-shacl-shape.xsl
index 93384ff..e47cb36 100644
--- a/src/shacl-shape-lib/elements-shacl-shape.xsl
+++ b/src/shacl-shape-lib/elements-shacl-shape.xsl
@@ -367,11 +367,122 @@
             </rdf:Description>
         </xsl:if>
     </xsl:template>
+    
+    <xd:doc>
+        <xd:desc>Rule D.06. Enumeration item — Specify a restrictive SHACL NodeShape for items of an enumeration 
+            for each UML Enumeration in the defining mode (based on the constraint level set for the UML Enumeration 
+            as defined in rule:enumeration-constraint-level). The URIs of the node shape is deterministically generated 
+            from the UML Enumeration name. Set a constraint for the enumeration item belonging to a concept scheme 
+            represented by the enumeration URI.</xd:desc>
+        <xd:param name="enumeration"/>
+    </xd:doc>
+    <xsl:template name="enumerationItem">
+        <xsl:param name="enumeration"/>
+        
+        <!-- Get the enumeration's compact URI -->
+        <xsl:variable name="enumerationCompactURI" select="$enumeration/@name"/>
+        
+        <xsl:if test="$enumerationCompactURI and $enableGenerationOfSkosConcept">
+            <xsl:variable name="shapeURI" select="f:buildPropertyShapeURI($enumerationCompactURI, 'itemShape')"/>
+                <xsl:variable name="inSchemeURI" select="f:buildURIfromLexicalQName($enumerationCompactURI)"/>
+                
+                <rdf:Description rdf:about="{$shapeURI}">
+                    <rdf:type rdf:resource="http://www.w3.org/ns/shacl#NodeShape"/>
+                    <sh:property rdf:parseType="Resource">
+                        <sh:path rdf:resource="http://www.w3.org/2004/02/skos/core#inScheme"/>
+                        <sh:hasValue rdf:resource="{$inSchemeURI}"/>
+                    </sh:property>
+                </rdf:Description>
+        </xsl:if>
+    </xsl:template>
+    
+    <xd:doc>
+        <xd:desc>
+            Rule R.13. Dependency range shape — Within the SHACL PropertyShape corresponding to a dependency relation 
+            linked to a given source UML Class, constraint the range of the dependency.
+            Specify the suitable constraint based on the constraint level set for the UML Enumeration 
+     
+            * permissive: set skos:Concept as the expected type of an enumeration item
+            
+            * restrictive: refer to a NodeShape for an enumeration item that further restricts allowed values
+        </xd:desc>
+        <xd:param name="enumeration"/>
+    </xd:doc>
+    <xsl:template name="enumerationDependencyRangeShape">
+        <xsl:param name="enumeration"/>
+        
+        <!-- Root element and enumeration tags -->
+        <xsl:variable name="root" select="root($enumeration)"/>
+        <xsl:variable name="enumerationTags" select="f:getElementTags($enumeration)"/>
+        
+        <!-- Get the enumeration's compact URI -->
+        <xsl:variable name="enumerationCompactURI" select="$enumeration/@name"/>
+        
+        <!-- Determine the constraint level, defaulting to 'permissive' -->
+        <xsl:variable name="enumerationConstraintLevel" 
+            select="
+            if (some $tag in $enumerationTags satisfies $tag/@name = $cvConstraintLevelProperty)
+            then ($enumerationTags[@name = $cvConstraintLevelProperty][1]/@value)
+            else 'permissive'
+            "/>
+        
+        <!-- Retrieve all dependency IDs -->
+
+        <xsl:variable name="dependenciesIds" select="$enumeration/links/Dependency/@xmi:id"/>  
+        
+        <!-- Generate RDF descriptions based on the constraint level -->
+        <xsl:choose>
+            <xsl:when test="$enumerationConstraintLevel = 'restrictive' and $enableGenerationOfSkosConcept">
+                <!-- Iterate over dependencies -->
+
+                    <xsl:variable name="nodeUri" select="f:buildPropertyShapeURI($enumerationCompactURI, 'itemShape')"/>
+                    <xsl:for-each select="$dependenciesIds">
+                        <xsl:variable name="dependencyConnector" select="f:getConnectorByIdRef(., $root)"/>
+                        <xsl:variable name="dependencyName" select="$dependencyConnector/target/role/@name"/>
+                        <xsl:variable name="sourceClassName" select="$dependencyConnector/source/model/@name"/>
+                        <xsl:variable name="shapeUriClassDependency" 
+                            select="f:buildPropertyShapeURI($sourceClassName, $dependencyName)"/>
+                        
+                        <rdf:Description rdf:about="{$shapeUriClassDependency}">
+                            <rdf:type rdf:resource="http://www.w3.org/ns/shacl#PropertyShape"/>
+                            <sh:path rdf:resource="{f:buildURIfromLexicalQName($dependencyName)}"/>
+                            <sh:node rdf:resource="{$nodeUri}"/>
+                        </rdf:Description>
+                    </xsl:for-each>
+                
+            </xsl:when>
+            <xsl:when test="$enumerationConstraintLevel = 'permissive' and $enableGenerationOfSkosConcept">
+                <!-- Generate shapes for permissive or default cases -->
+                <xsl:for-each select="$dependenciesIds">
+                    <xsl:variable name="dependencyConnector" select="f:getConnectorByIdRef(., $root)"/>
+                    <xsl:variable name="dependencyName" select="$dependencyConnector/target/role/@name"/>
+                    <xsl:variable name="sourceClassName" select="$dependencyConnector/source/model/@name"/>
+                    <xsl:variable name="shapeUriClassDependency" 
+                        select="f:buildPropertyShapeURI($sourceClassName, $dependencyName)"/>
+                    
+                    <rdf:Description rdf:about="{$shapeUriClassDependency}">
+                        <rdf:type rdf:resource="http://www.w3.org/ns/shacl#PropertyShape"/>
+                        <sh:path rdf:resource="{f:buildURIfromLexicalQName($dependencyName)}"/>
+                        <sh:class rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
+                    </rdf:Description>
+                </xsl:for-each>
+            </xsl:when>
+        </xsl:choose>
+    </xsl:template>
 
     <xd:doc>
-        <xd:desc>This will override the common selector when applying templates</xd:desc>
+        <xd:desc>Applying shape layer rules to Enumeration dependencies and items</xd:desc>
     </xd:doc>
-    <xsl:template match="element[@xmi:type = 'uml:Enumeration']"/>
+    <xsl:template match="element[@xmi:type = 'uml:Enumeration']">
+        <xsl:if test="not(f:isExcludedByStatus(.))">
+            <xsl:call-template name="enumerationItem">
+                <xsl:with-param name="enumeration" select="."/>
+            </xsl:call-template>
+            <xsl:call-template name="enumerationDependencyRangeShape">
+                <xsl:with-param name="enumeration" select="."/>
+            </xsl:call-template>
+        </xsl:if>
+    </xsl:template>
 
     <xd:doc>
         <xd:desc>This will override the common selector when applying templates</xd:desc>
diff --git a/test/ePO-default-config/config-parameters.xsl b/test/ePO-default-config/config-parameters.xsl
index 0d23f1c..b8540b9 100644
--- a/test/ePO-default-config/config-parameters.xsl
+++ b/test/ePO-default-config/config-parameters.xsl
@@ -70,6 +70,9 @@
     
     <!--    This variable controls whether the enumerations are transformed into skos schemes or ignored-->
     <xsl:variable name="enableGenerationOfConceptSchemes" select="fn:false()"/>
+    
+<!--    Property used for constraint level for enumerations-->
+    <xsl:variable name="cvConstraintLevelProperty" select="'epo:constraintLevel'"/>
 
 
     <!--Allowed characters for a normalized string-->
@@ -85,6 +88,9 @@
     <xsl:variable name="commentsGeneration" select="fn:true()"/>
     <xsl:variable name="commentProperty" select="'skos:editorialNote'"/>
     
+     <!--    Tag names/keys that are excluded from output -->
+    <xsl:variable name="excludedTagNamesList" select="($statusProperty, $cvConstraintLevelProperty)"/>
+    
      <!--    Variables for status filtering -->
     <xsl:variable name="statusProperty" select="'epo:status'"/>
     <xsl:variable name="validStatusesList" select="('proposed', 'approved', 'implemented')"/>
diff --git a/test/testData/ePO-task1-test-status-filtering.xml b/test/testData/ePO-core-4.2.0.xml
similarity index 99%
rename from test/testData/ePO-task1-test-status-filtering.xml
rename to test/testData/ePO-core-4.2.0.xml
index e319d2e..edaff25 100644
--- a/test/testData/ePO-task1-test-status-filtering.xml
+++ b/test/testData/ePO-core-4.2.0.xml
@@ -5867,13 +5867,22 @@
 				</packagedElement>
 				<packagedElement xmi:type="uml:Package" xmi:id="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" name="controlled vocabularies">
 					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_B7F675EC_18B3_49b1_AAF4_E0FAB88D85EE" name="at-voc:access-rights"/>
-					<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_DFCCF9E6_D161_4a4e_8468_6429D56A1496" name="at-voc:accessibility">
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_7D328D91_8F78_4da8_A526_0DD995A319C8" name="inc"/>
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_6497FC0E_E36A_4cfd_94BE_2D91D33C15F0" name="n-inc"/>
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_A1D54489_1EFA_4151_B4E8_37DA9328D777" name="n-inc-just"/>
+					</packagedElement>
 					<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_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" name="at-voc:contract-nature"/>
+					<packagedElement xmi:type="uml:Enumeration" xmi:id="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" name="at-voc:contract-nature">
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_64FE35B4_FA7D_4bd4_99FC_0D1E346F7936" name="supplies"/>
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_9A1EA897_0087_47ec_971B_6ED3A408D6A1" name="works"/>
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_7F1748D8_D928_40a8_ADA1_53F3B44A99F3" name="services"/>
+						<ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="EAID_576EDB28_9517_474d_BF52_7646B690279B" name="combined"/>
+					</packagedElement>
 					<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"/>
@@ -5889,7 +5898,7 @@
 					<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_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"/>
@@ -7591,28 +7600,29 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_4FF9AAC8_5E59_49bd_B4C7_BC3E17610EF7" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_B52CB5AD_2F7E_4e03_AFA8_D5DCED9D61C7" modelElement="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_5E59_49bd_B4C7_BC3E17610EF7" text="+epo:definesSpecificPlaceOfPerformance" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B4C7_BC3E17610EF7" x="2092" y="1105" width="165" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_B4C7_BC3E17610EF7" x="2083" y="1105" width="165" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_5E59_49bd_B4C7_BC3E17610EF7" text="0..*" modelElement="EAID_dst2EFC84_74F8_415f_B4C7_BC3E17610EF7">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B4C7_BC3E17610EF7" x="2185" y="1133" width="17" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_B4C7_BC3E17610EF7" x="2176" y="1133" width="17" height="14"/>
 				</ownedElement>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B4C7_BC3E17610EF7" x="2043" y="461"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="461"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B4C7_BC3E17610EF7" x="2177" y="1151"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_B4C7_BC3E17610EF7" x="2032" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_B4C7_BC3E17610EF7" x="2032" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000002_5E59_49bd_B4C7_BC3E17610EF7" x="2168" y="523"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000003_5E59_49bd_B4C7_BC3E17610EF7" x="2168" y="1151"/>
 			</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"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_5E59_49bd_8694_914903478877" x="1883" 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"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_5E59_49bd_8694_914903478877" x="1957" 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"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_5E59_49bd_8694_914903478877" x="1949" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_8694_914903478877" x="1949" y="558"/>
 			</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_WP000000_5E59_49bd_BE3B_872E1A0882C0" x="1746" y="501"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_5E59_49bd_BE3B_872E1A0882C0" x="1746" 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_8BC2_8F80AD12DA02" source="EAID_40588AD6_810D_4fd6_BA64_B05755E636F2" target="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" modelElement="EAID_BA97DF04_90AD_4153_8BC2_8F80AD12DA02">
@@ -12698,7 +12708,7 @@
 			</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"/>
-				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_8217_0049EA327F90" text="at-voc:language"/>
+				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_9AA0_45fa_8217_0049EA327F90" text="at-voc:language`"/>
 				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_9AA0_45fa_8217_0049EA327F90" x="947" y="479" width="90" height="60"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_2468B950_9AA0_45fa_805E_C8B5A8985BC5" modelElement="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5">
@@ -14320,7 +14330,7 @@
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_8468_6429D56A1496" modelElement="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496">
 				<ownedElement xmi:type="umldi:UMLKeywordLabel" xmi:id="EAID_KL000000_588B_4ede_8468_6429D56A1496" text="enumeration"/>
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_8468_6429D56A1496" text="at-voc:accessibility"/>
-				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8468_6429D56A1496" x="1007" y="223" width="90" height="60"/>
+				<bounds xmi:type="dc:bounds" xmi:id="EAID_DB000000_588B_4ede_8468_6429D56A1496" x="1057" y="223" width="90" height="82"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLClassifierShape" xmi:id="EAID_D7F91EFA_588B_4ede_BAA8_68D1BF528FF5" modelElement="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5">
 				<ownedElement xmi:type="umldi:UMLNameLabel" xmi:id="EAID_NL000000_588B_4ede_BAA8_68D1BF528FF5" text="epo:ProcurementObject"/>
@@ -14351,7 +14361,7 @@
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_826E_974C4A3AEF87" source="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_81D470D5_433B_4242_826E_974C4A3AEF87">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_588B_4ede_826E_974C4A3AEF87" text="+epo:fulfillsStrategicProcurement" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
-					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_826E_974C4A3AEF87" x="440" y="233" width="133" height="14"/>
+					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTEL000000_588B_4ede_826E_974C4A3AEF87" x="426" y="233" width="133" height="14"/>
 				</ownedElement>
 				<ownedElement xmi:type="umldi:UMLMultiplicityLabel" xmi:id="EAID_TML000000_588B_4ede_826E_974C4A3AEF87" text="0..*" modelElement="EAID_dstD470D5_433B_4242_826E_974C4A3AEF87">
 					<bounds xmi:type="dc:bounds" xmi:id="EAID_DBTML000000_588B_4ede_826E_974C4A3AEF87" x="559" y="260" width="17" height="14"/>
@@ -14407,8 +14417,8 @@
 				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_8718_882951247DF8" x="760" y="288"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_AA32_D22B32C1DF1F" source="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" target="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" modelElement="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F">
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AA32_D22B32C1DF1F" x="866" y="257"/>
-				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AA32_D22B32C1DF1F" x="1007" y="257"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000000_588B_4ede_AA32_D22B32C1DF1F" x="866" y="267"/>
+				<waypoint xmi:type="dc:waypoint" xmi:id="EAID_WP000001_588B_4ede_AA32_D22B32C1DF1F" x="1057" y="267"/>
 			</ownedElement>
 			<ownedElement xmi:type="umldi:UMLEdge" xmi:id="EAID_D7F91EFA_588B_4ede_934F_BBF695929296" source="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" target="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" modelElement="EAID_32F239DB_02BC_456a_934F_BBF695929296">
 				<ownedElement xmi:type="umldi:UMLAssociationEndLabel" xmi:id="EAID_TEL000000_588B_4ede_934F_BBF695929296" text="+epo:fulfillsStrategicProcurement" modelElement="EAID_dstF239DB_02BC_456a_934F_BBF695929296">
@@ -16200,7 +16210,7 @@
 			</ownedElement>
 			<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"/>
+				<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="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">
@@ -26189,6 +26199,53 @@
 				<tags/>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<attributes>
+					<attribute xmi:idref="EAID_7D328D91_8F78_4da8_A526_0DD995A319C8" name="inc" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="456" ea_guid="{7D328D91-8F78-4da8-A526-0DD995A319C8}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={A99612EF-C5DA-41c5-A38B-C432D5E747C8}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={7D328D91-8F78-4da8-A526-0DD995A319C8}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+					<attribute xmi:idref="EAID_6497FC0E_E36A_4cfd_94BE_2D91D33C15F0" name="n-inc" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="457" ea_guid="{6497FC0E-E36A-4cfd-94BE-2D91D33C15F0}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={1FB0F5B0-F198-44b6-9487-D6C14BE38407}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={6497FC0E-E36A-4cfd-94BE-2D91D33C15F0}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+					<attribute xmi:idref="EAID_A1D54489_1EFA_4151_B4E8_37DA9328D777" name="n-inc-just" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="458" ea_guid="{A1D54489-1EFA-4151-B4E8-37DA9328D777}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={A1CE85FC-2E71-4b90-B33B-809F28203811}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={A1D54489-1EFA-4151-B4E8-37DA9328D777}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+				</attributes>
 				<links>
 					<Dependency xmi:id="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" start="EAID_B104B43A_9BF1_424a_98A6_28E358A11BEA" end="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496"/>
 				</links>
@@ -26199,7 +26256,9 @@
 				<project author="estaromi" version="1.0" phase="1.0" created="2019-09-12 15:52:13" modified="2023-03-22 12:12: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/>
+				<tags>
+					<tag xmi:id="EAID_A97A8A8F_EB5E_4963_971C_6193A0F56849" name="epo:constraintLevel" value="permissive" modelElement="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82"/>
+				</tags>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
@@ -26266,9 +26325,73 @@
 				<project author="mfontsan" version="1.0" phase="1.0" created="2018-05-28 12:35:50" modified="2023-03-22 12:28: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/>
+				<tags>
+					<tag xmi:id="EAID_B14CA464_B2E6_434f_A784_20650AFDBCF8" name="epo:constraintLevel" value="restrictive" modelElement="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8"/>
+				</tags>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
+				<attributes>
+					<attribute xmi:idref="EAID_64FE35B4_FA7D_4bd4_99FC_0D1E346F7936" name="supplies" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="462" ea_guid="{64FE35B4-FA7D-4bd4-99FC-0D1E346F7936}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="0"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={86972812-DC6B-48bd-8B13-9E885BBAB080}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={64FE35B4-FA7D-4bd4-99FC-0D1E346F7936}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+					<attribute xmi:idref="EAID_9A1EA897_0087_47ec_971B_6ED3A408D6A1" name="works" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="463" ea_guid="{9A1EA897-0087-47ec-971B-6ED3A408D6A1}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="1"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={DB71902A-95EE-43b8-9990-2516ECD96CE6}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={9A1EA897-0087-47ec-971B-6ED3A408D6A1}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+					<attribute xmi:idref="EAID_7F1748D8_D928_40a8_ADA1_53F3B44A99F3" name="services" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="464" ea_guid="{7F1748D8-D928-40a8-ADA1-53F3B44A99F3}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="2"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={87FC2A53-20D5-4472-BE21-2F8888DC3010}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={7F1748D8-D928-40a8-ADA1-53F3B44A99F3}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+					<attribute xmi:idref="EAID_576EDB28_9517_474d_BF52_7646B690279B" name="combined" scope="Public">
+						<initial/>
+						<documentation/>
+						<model ea_localid="465" ea_guid="{576EDB28-9517-474d-BF52-7646B690279B}"/>
+						<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
+						<coords ordered="0"/>
+						<containment containment="Not Specified" position="3"/>
+						<stereotype stereotype="enum"/>
+						<bounds lower="1" upper="1"/>
+						<options/>
+						<style/>
+						<styleex value="IsLiteral=1;volatile=0;"/>
+						<tags/>
+						<xrefs value="$XREFPROP=$XID={2617DDBD-9890-44d4-8F80-33D03363BB7E}$XID;$NAM=Stereotypes$NAM;$TYP=attribute property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=enum;GUID={780B7190-0EB2-422c-9615-6C0A92CD327D};@ENDSTEREO;$DES;$CLT={576EDB28-9517-474d-BF52-7646B690279B}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
+					</attribute>
+				</attributes>
 				<links>
 					<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"/>
@@ -26486,7 +26609,7 @@
 					<Dependency xmi:id="EAID_FA7858FE_BA9B_4d0a_88C5_0D1CAE6FE311" start="EAID_3AB10978_49C3_497d_AFCB_7D5D95D51A5A" end="EAID_0CC18385_984E_4d4c_A942_07304CE66481"/>
 				</links>
 			</element>
-			<element xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" xmi:type="uml:Enumeration" name="at-voc:language" scope="public">
+			<element xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90" xmi:type="uml:Enumeration" name="at-voc:language`" scope="public">
 				<model package="EAPK_CE5E556D_E033_494e_BC8F_925DAAC7560E" tpos="0" ea_localid="232" ea_eleType="element"/>
 				<properties documentation="The Language authority table is a controlled vocabulary that lists concepts associated with languages.&#xA;&#xA;Its main scope is to support activities associated with publication process.&#xA;&#xA;The concepts included are correlated with the ISO 639 international standard. This standard is issued in several parts:&#xA;&#xA;ISO 639-1 contains strictly two alphabetic letters (alpha-2),&#xA;&#xA;ISO 639-2/B (B = bibliographic) is used for bibliographic purpose (alpha-3),&#xA;&#xA;ISO 639-2/T (T = terminology) is used for technical purpose (alpha-3),&#xA;&#xA;ISO 639-3 covers all the languages and macro-languages of the world (alpha-3); the values are compliant with ISO 639-2/T.&#xA;&#xA;If an authority code is needed for a language without assigned ISO code, an alphanumeric code is created in order to not confuse with ISO codes that are strictly alphabetic.&#xA;&#xA;" isSpecification="false" sType="Enumeration" nType="0" scope="public" isRoot="false" isLeaf="false" isAbstract="false"/>
 				<project author="estaromi" version="1.0" phase="1.0" created="2018-12-11 15:48:46" modified="2024-11-04 12:55:01" complexity="1" status="Proposed"/>
@@ -26710,7 +26833,9 @@
 				<project author="estaromi" version="1.0" phase="1.0" created="2019-02-21 16:56:58" modified="2023-03-22 12:35: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/>
+				<tags>
+					<tag xmi:id="EAID_C32EAD66_B2A0_4768_81E2_B8E7C22E870E" name="epo:constraintLevel" value="restrictive" modelElement="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5"/>
+				</tags>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
@@ -26926,7 +27051,9 @@
 				<project author="lps" version="1.0" phase="1.0" created="2022-04-01 17:14:16" modified="2024-11-04 10:13: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/>
+				<tags>
+					<tag xmi:id="EAID_08CFFD8F_3C34_4695_9166_D29A8A24A864" name="epo:constraintLevel" value="unknown" modelElement="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9"/>
+				</tags>
 				<xrefs/>
 				<extendedProperties tagged="0" package_name="controlled vocabularies"/>
 				<links>
@@ -37016,7 +37143,7 @@
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="232" type="Enumeration" name="at-voc:language"/>
+					<model ea_localid="232" type="Enumeration" name="at-voc:language`"/>
 					<role name="epo:hasOfficialLanguage" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -37086,7 +37213,7 @@
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="232" type="Enumeration" name="at-voc:language"/>
+					<model ea_localid="232" type="Enumeration" name="at-voc:language`"/>
 					<role name="epo:hasUnofficialLanguage" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -38500,7 +38627,7 @@
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="232" type="Enumeration" name="at-voc:language"/>
+					<model ea_localid="232" type="Enumeration" name="at-voc:language`"/>
 					<role name="epo:hasPreferredLanguageForProcurementDocument" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -47942,7 +48069,7 @@
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="232" type="Enumeration" name="at-voc:language"/>
+					<model ea_localid="232" type="Enumeration" name="at-voc:language`"/>
 					<role name="epo:hasLanguage" visibility="Public" targetScope="instance"/>
 					<type multiplicity="0..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -51449,7 +51576,7 @@
 					<tags/>
 				</source>
 				<target xmi:idref="EAID_1A66B07B_A8FD_481e_8217_0049EA327F90">
-					<model ea_localid="232" type="Enumeration" name="at-voc:language"/>
+					<model ea_localid="232" type="Enumeration" name="at-voc:language`"/>
 					<role name="dct:language" visibility="Public" targetScope="instance"/>
 					<type multiplicity="1..*" aggregation="none" containment="Unspecified"/>
 					<constraints/>
@@ -52508,6 +52635,17 @@
 				<packagedElement xmi:type="uml:Extension" xmi:id="Class_schema:version^^xsd:decimal" name="A_Class_schema:version^^xsd:decimal" memberEnd="extension_schema:version^^xsd:decimal schema:version^^xsd:decimal-base_Class">
 					<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="extension_schema:version^^xsd:decimal" name="extension_schema:version^^xsd:decimal" type="schema:version^^xsd:decimal" isComposite="true" lower="0" upper="1" memberEnd="extension_schema:version^^xsd:decimal schema:version^^xsd:decimal-base_Class"/>
 				</packagedElement>
+				<packagedElement xmi:type="uml:Stereotype" xmi:id="epo:constraintLevel" name="epo:constraintLevel">
+					<ownedAttribute xmi:type="uml:Property" xmi:id="epo:constraintLevel-base_Enumeration" name="base_Enumeration" association="Enumeration_epo:constraintLevel">
+						<type href="http://www.omg.org/spec/UML/20161101/UML.xmi#Enumeration"/>
+					</ownedAttribute>
+					<ownedAttribute xmi:type="uml:Property" xmi:id="epo:constraintLevel-epo:constraintLevel" name="epo:constraintLevel">
+						<type href="http://www.omg.org/spec/UML/20161101/UML.xmi#String"/>
+					</ownedAttribute>
+				</packagedElement>
+				<packagedElement xmi:type="uml:Extension" xmi:id="Enumeration_epo:constraintLevel" name="A_Enumeration_epo:constraintLevel" memberEnd="extension_epo:constraintLevel epo:constraintLevel-base_Enumeration">
+					<ownedEnd xmi:type="uml:ExtensionEnd" xmi:id="extension_epo:constraintLevel" name="extension_epo:constraintLevel" type="epo:constraintLevel" isComposite="true" lower="0" upper="1" memberEnd="extension_epo:constraintLevel epo:constraintLevel-base_Enumeration"/>
+				</packagedElement>
 				<packagedElement xmi:type="uml:Stereotype" xmi:id="owl:deprecated^^xsd:boolean" name="owl:deprecated^^xsd:boolean">
 					<ownedAttribute xmi:type="uml:Property" xmi:id="owl:deprecated^^xsd:boolean-base_Class" name="base_Class" association="Class_owl:deprecated^^xsd:boolean">
 						<type href="http://www.omg.org/spec/UML/20161101/UML.xmi#Class"/>
@@ -52877,13 +53015,13 @@
 			<diagram xmi:id="EAID_4FF9AAC8_5E59_49bd_A037_CBB07F6B2BA8">
 				<model package="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" localID="152" owner="EAPK_4200ABB9_EB75_4f04_8F9A_4D873BD27C72" tpos="2"/>
 				<properties name="competition" type="Logical"/>
-				<project author="andreea" version="1.0" created="2022-05-16 11:37:28" modified="2024-10-22 09:11:57"/>
+				<project author="andreea" version="1.0" created="2022-05-16 11:37:28" modified="2025-01-29 10:11: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=B7F1BB9B;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=50699C1A;"/>
 				<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:Calibri,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/>
-				<persistentstyle value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
+				<persistentstyle value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;Swimlanes=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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
 				<xrefs/>
 				<elements>
 					<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;"/>
@@ -52936,10 +53074,10 @@
 					<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="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="SX=-63;SY=0;EX=-60;EY=0;EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=CX=108:CY=14:OX=55:OY=35:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=1202:-255$2850:-255$2850:-1958$2134:-1958$;" subject="EAID_A8CBD7C1_E82A_4979_98A5_58BD6A43131C" style="Mode=3;EOID=0F0DA707;SOID=EA7F007D;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="EX=-16;EY=0;SX=0;SY=-68;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=165:CY=14:OX=87:OY=-28:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=2177:-461$;" subject="EAID_A02EFC84_74F8_415f_B4C7_BC3E17610EF7" style="Mode=3;EOID=4B7F9A88;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
-					<element geometry="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=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="EX=-25;EY=0;SX=151;SY=0;EDGE=3;$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=2032:-523$2168:-523$;" 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=0;SY=-1;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=-135;SY=0;EX=0;EY=5;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=1746:-615$;" subject="EAID_D62CD782_93C6_480f_BE3B_872E1A0882C0" style="Mode=3;EOID=4B477F82;SOID=B424C8ED;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=113:CY=14:OX=-8: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_BA97DF04_90AD_4153_8BC2_8F80AD12DA02" style="Mode=3;EOID=54F3A151;SOID=B424C8ED;Color=-1;LWidth=0;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;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=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;"/>
@@ -54461,12 +54599,13 @@
 			<diagram xmi:id="EAID_D7F91EFA_588B_4ede_B41F_FFC57647CF02">
 				<model package="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" localID="62" owner="EAPK_FE3FEF05_DD69_4fca_A8A4_6F0FCF36A9C1" tpos="0"/>
 				<properties name="strategic procurement relations" type="Logical"/>
-				<project author="lps" version="1.0" created="2022-01-18 14:07:00" modified="2024-07-18 16:15:26"/>
+				<project author="lps" version="1.0" created="2022-01-18 14:07:00" modified="2025-01-29 15:46: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=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=45947E90;"/>
+				<style2 value="ExcludeRTF=0;DocAll=0;HideQuals=0;AttPkg=1;ShowTests=0;ShowMaint=0;SuppressFOC=1;MatrixActive=0;SwimlanesActive=1;KanbanActive=0;MatrixLineWidth=1;MatrixLineClr=0;MatrixLocked=0;TConnectorNotation=UML 2.1;TExplicitNavigability=0;AdvancedElementProps=1;AdvancedFeatureProps=1;AdvancedConnectorProps=1;m_bElementClassifier=1;SPT=1;MDGDgm=;STBLDgm=;ShowNotes=0;VisibleAttributeDetail=0;ShowOpRetType=1;SuppressBrackets=0;SuppConnectorLabels=0;PrintPageHeadFoot=0;ShowAsList=0;SuppressedCompartments=;Theme=:119;SaveTag=FCB40B1E;"/>
 				<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:Calibri,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/>
+				<persistentstyle value="DGS=On=0:CNT=8:W=120:H=40:SG=0:SGH=0:AEB=0:;AR=0;DCL=0;Swimlanes=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:Calibri,lfe:0,lfo:0,lfchar:1,lfop:0,lfcp:0,lfq:0,lfpf=0,lfWidth=0;;"/>
 				<xrefs/>
 				<elements>
 					<element geometry="Left=591;Top=93;Right=853;Bottom=163;" subject="EAID_49935879_5AF2_42ce_A416_3E77939F9B7A" seqno="1" style="DUID=48DDA79B;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -54475,7 +54614,7 @@
 					<element geometry="Left=236;Top=544;Right=326;Bottom=604;" subject="EAID_63483BB6_C796_4631_87DA_3F3808C4744F" seqno="4" style="DUID=CA26C73C;"/>
 					<element geometry="Left=522;Top=536;Right=612;Bottom=611;" subject="EAID_B81500F4_C78F_4431_A0DA_EA1E43E5C728" seqno="5" style="DUID=44193417;"/>
 					<element geometry="Left=195;Top=184;Right=427;Bottom=321;" subject="EAID_8D49E47D_4538_44e7_BAA8_68D1BF528FF5" seqno="6" style="DUID=9134ADDE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="Left=1007;Top=223;Right=1097;Bottom=283;" subject="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" seqno="7" style="DUID=BB3A8477;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
+					<element geometry="Left=1057;Top=223;Right=1147;Bottom=305;" subject="EAID_DFCCF9E6_D161_4a4e_8468_6429D56A1496" seqno="7" style="DUID=BB3A8477;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=386;Top=536;Right=476;Bottom=611;" subject="EAID_BF1B4E2A_7D4A_4247_8B45_5AD2427938E3" seqno="8" style="DUID=DE6DEE5D;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=852;Top=537;Right=942;Bottom=612;" subject="EAID_53AB9EFA_0DDD_4512_8CA7_9D132E537955" seqno="9" style="DUID=26C908DE;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=677;Top=537;Right=767;Bottom=612;" subject="EAID_6C0716CF_8E33_4ea7_972F_AB425AA26120" seqno="10" style="DUID=99EE96CC;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
@@ -54483,7 +54622,7 @@
 					<element geometry="Left=831;Top=379;Right=964;Bottom=449;" subject="EAID_2DF96E3A_E135_465d_908F_EAB3689291DE" seqno="12" style="DUID=166F71BF;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=653;Top=379;Right=791;Bottom=449;" subject="EAID_EC3D2F66_1FC6_4b4c_AAD2_04A3726B2332" seqno="13" style="DUID=EC4A0A07;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
 					<element geometry="Left=386;Top=379;Right=612;Bottom=449;" subject="EAID_1A74FEEE_DC5B_41d7_BABD_E3BB2D5283C4" seqno="14" style="DUID=7D859619;NSL=0;BCol=-1;BFol=-1;LCol=-1;LWth=-1;fontsz=0;bold=0;black=0;italic=0;ul=0;charset=0;pitch=0;"/>
-					<element geometry="SX=0;SY=-10;EX=0;EY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=-3:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" style="Mode=3;EOID=5003271B;SOID=9134ADDE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=0;SY=-10;EX=0;EY=13;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=-17:OY=-4:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_81D470D5_433B_4242_826E_974C4A3AEF87" style="Mode=3;EOID=5003271B;SOID=9134ADDE;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=-22;EX=2;EY=0;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=197:CY=14:OX=107:OY=-53:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=283:-436$;" subject="EAID_8F9F898E_D644_43bd_B368_6604C3E040EC" style="Mode=3;EOID=CA26C73C;SOID=AC7E9B01;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=-63;SY=0;EX=0;EY=30;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=209:CY=14:OX=92:OY=-33:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_78ABF07D_FFDF_40a2_8CAF_4B1C7067546E" style="Mode=3;EOID=0905FDBF;SOID=AC7E9B01;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=5;SY=6;EX=5;EY=6;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=134:CY=14:OX=-2:OY=3:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_0BE43E48_CB11_4fae_87F3_C0ACAEAF591C" style="Mode=3;EOID=7D859619;SOID=AC7E9B01;Color=-1;LWidth=0;Hidden=0;"/>
@@ -54494,7 +54633,7 @@
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_ADB72D59_DC72_465e_97A2_B2C5B93B0F80" style="Mode=3;EOID=5003271B;SOID=EC4A0A07;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=98:CY=14:OX=42:OY=-26:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_5C87BC92_AF78_4f16_994C_2F6853BD9DA7" style="Mode=3;EOID=26C908DE;SOID=166F71BF;Color=-1;LWidth=0;Hidden=0;"/>
 					<element geometry="EDGE=1;$LLB=;LLT=;LMT=;LMB=;LRT=;LRB=;IRHS=;ILHS=;Path=;" subject="EAID_857D08F9_84F2_4d98_8718_882951247DF8" style="Mode=3;EOID=5003271B;SOID=166F71BF;Color=-1;LWidth=0;Hidden=0;"/>
-					<element geometry="SX=91;SY=12;EX=0;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=0:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=4:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" style="Mode=3;EOID=BB3A8477;SOID=5003271B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
+					<element geometry="SX=91;SY=12;EX=0;EY=-8;EDGE=2;$LLB=;LLT=;LMT=;LMB=;LRT=CX=137:CY=14:OX=-29:OY=-2:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=-6:OY=6:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_1BB31111_F63D_4464_AA32_D22B32C1DF1F" style="Mode=3;EOID=BB3A8477;SOID=5003271B;Color=-1;LWidth=0;TREE=OR;Hidden=0;"/>
 					<element geometry="SX=0;SY=0;EX=0;EY=0;EDGE=3;$LLB=;LLT=;LMT=;LMB=;LRT=CX=133:CY=14:OX=72:OY=-23:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;LRB=CX=17:CY=14:OX=0:OY=0:HDN=0:BLD=0:ITA=0:UND=0:CLR=-1:ALN=1:DIR=0:ROT=0;IRHS=;ILHS=;Path=;" subject="EAID_32F239DB_02BC_456a_934F_BBF695929296" style="Mode=3;EOID=5003271B;SOID=48DDA79B;Color=-1;LWidth=0;Hidden=0;"/>
 				</elements>
 			</diagram>
@@ -55436,7 +55575,11 @@
 	<thecustomprofile:skos_historyNote base_Class="EAID_D461B820_4E2F_4cfe_BD2A_3CD31A751F07" __EAStereoName="skos:historyNote" skos_historyNote="WG approval 05/12/2018"/>
 	<thecustomprofile:skos_historyNote base_Class="EAID_22015748_6BE4_4a9e_A9E4_B33CA4DA4C39" __EAStereoName="skos:historyNote" skos_historyNote="WG approval 16/05/2023"/>
 	<thecustomprofile:skos_historyNote base_Class="EAID_811D4703_55F7_4d6e_B8D8_207479C15419" __EAStereoName="skos:historyNote" skos_historyNote="WG approval 03/05/2022"/>
+	<thecustomprofile:epo_constraintLevel base_Enumeration="EAID_9700E0F6_A1F2_4c3e_9848_ECC8B70AFE82" __EAStereoName="epo:constraintLevel" epo_constraintLevel="permissive"/>
+	<thecustomprofile:epo_constraintLevel base_Enumeration="EAID_499A4BAD_6188_4f6f_B5BC_9B871A4349B8" __EAStereoName="epo:constraintLevel" epo_constraintLevel="restrictive"/>
 	<thecustomprofile:skos_historyNote base_Enumeration="EAID_B64484AC_23D5_423f_A683_B6FC29EE98CC" __EAStereoName="skos:historyNote" skos_historyNote="WG approval 28/01/2021"/>
+	<thecustomprofile:epo_constraintLevel base_Enumeration="EAID_1D435754_B2BA_42ed_805E_C8B5A8985BC5" __EAStereoName="epo:constraintLevel" epo_constraintLevel="restrictive"/>
 	<thecustomprofile:epo_status base_Enumeration="EAID_9303CE6E_F83F_4762_A306_7FCBDE0E5A37" __EAStereoName="epo:status" epo_status="proposed"/>
+	<thecustomprofile:epo_constraintLevel base_Enumeration="EAID_EDCD6F3A_F86A_46ca_ACD1_13C3E1A4B7F9" __EAStereoName="epo:constraintLevel" epo_constraintLevel="unknown"/>
 	<thecustomprofile:epo_status base_DataType="EAID_E9C93CAA_45B7_4f47_B2EE_43D24C0266C8" __EAStereoName="epo:status" epo_status="proposed"/>
 </xmi:XMI>
\ No newline at end of file
diff --git a/test/unitTests/test-common/test-checkers.xspec b/test/unitTests/test-common/test-checkers.xspec
index c54ae9a..8a1cb0c 100644
--- a/test/unitTests/test-common/test-checkers.xspec
+++ b/test/unitTests/test-common/test-checkers.xspec
@@ -491,5 +491,31 @@
         </x:scenario>
     </x:scenario>
     
+    <x:scenario label="testing f:hasEnumerationAConstraintLevelProperty">
+        <x:scenario label="enumeration with no tags">
+            <x:call function="f:hasEnumerationAConstraintLevelProperty">
+                <x:param name="element" href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[259]"/>
+            </x:call>
+            <x:expect label="boolean-false" select="false()"/>
+        </x:scenario>
+        
+        <x:scenario label="enumeration with tag but without constraint level property tag">
+            <x:call function="f:hasEnumerationAConstraintLevelProperty">
+                <x:param name="element" href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[268]"/>
+            </x:call>
+            <x:expect label="boolean-false" select="false()"/>
+        </x:scenario>
+        
+        <x:scenario label="enumeration with correct tag and value">
+            <x:call function="f:hasEnumerationAConstraintLevelProperty">
+                <x:param name="element" href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[245]"/>
+            </x:call>
+            <x:expect label="boolean-true" select="true()"/>
+        </x:scenario>
+    </x:scenario>
+    
 </x:description>
 
diff --git a/test/unitTests/test-common/test-utils.xspec b/test/unitTests/test-common/test-utils.xspec
index c75c3d5..03b9cb4 100644
--- a/test/unitTests/test-common/test-utils.xspec
+++ b/test/unitTests/test-common/test-utils.xspec
@@ -350,7 +350,7 @@
 
     <x:scenario label="Scenario for testing filter by status - excluded element">
         <x:call function="f:isExcludedByStatus">
-            <x:param name="nodeInput"  href="../../testData/ePO-task1-test-status-filtering.xml"
+            <x:param name="nodeInput"  href="../../testData/ePO-core-4.2.0.xml"
                 select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[168]"/>
         </x:call>
         <x:expect label="result" select="fn:true()"/>
@@ -358,7 +358,7 @@
 
     <x:scenario label="Scenario for testing filter by status - excluded connector">
         <x:call function="f:isExcludedByStatus">
-            <x:param name="nodeInput"  href="../../testData/ePO-task1-test-status-filtering.xml"
+            <x:param name="nodeInput"  href="../../testData/ePO-core-4.2.0.xml"
                 select="/xmi:XMI/xmi:Extension[1]/connectors[1]/connector[648]"/>
         </x:call>
         <x:expect label="result" select="fn:true()"/>
@@ -366,7 +366,7 @@
 
     <x:scenario label="Scenario for testing filter by status - not excluded element - interpreted status">
         <x:call function="f:isExcludedByStatus">
-            <x:param name="nodeInput"  href="../../testData/ePO-task1-test-status-filtering.xml"
+            <x:param name="nodeInput"  href="../../testData/ePO-core-4.2.0.xml"
                 select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[236]"/>
         </x:call>
         <x:expect label="result" select="fn:false()"/>
@@ -374,7 +374,7 @@
 
     <x:scenario label="Scenario for testing filter by status - not excluded attribute - with implemented status">
         <x:call function="f:isExcludedByStatus">
-            <x:param name="nodeInput"  href="../../testData/ePO-task1-test-status-filtering.xml"
+            <x:param name="nodeInput"  href="../../testData/ePO-core-4.2.0.xml"
                 select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[234]/attributes[1]/attribute[2]"/>
         </x:call>
         <x:expect label="result" select="fn:false()"/>
diff --git a/test/unitTests/test-html-conventions-lib/test-enumeration-html-conventions.xspec b/test/unitTests/test-html-conventions-lib/test-enumeration-html-conventions.xspec
index 9d0c717..8034714 100644
--- a/test/unitTests/test-html-conventions-lib/test-enumeration-html-conventions.xspec
+++ b/test/unitTests/test-html-conventions-lib/test-enumeration-html-conventions.xspec
@@ -75,6 +75,23 @@
         <x:expect label="expect to find a Description Details element" test="boolean(/dd)"/> 
     </x:scenario>
     
+    <x:scenario label="enumeration no constraint level set">
+        <x:call template="enumerationConstraintLevel">
+            <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" 
+                select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[268]"/>
+        </x:call>
+        <x:expect label="expect to find a Description Details element" test="boolean(/dd)"/> 
+        <x:expect label="correct warning text"
+            test="contains(string(/dd), 'The enumeration at-voc:main-activity does not have a correct constraint level (either permissive or restrictive) set as a tag with the epo:constraintLevel key. The permissive level will be used as a fallback value.')"/>
+    </x:scenario>
+    
+    <x:scenario label="enumeration with constraint level set">
+        <x:call template="enumerationConstraintLevel">
+            <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" 
+                select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[245]"/>
+        </x:call>
+        <x:expect label="boolean-true" select="()"/>
+    </x:scenario>
    
     
 </x:description>
diff --git a/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
index 4698e50..363aef1 100644
--- a/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
+++ b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shape.xspec
@@ -15,6 +15,8 @@
     stylesheet="../../../src/shacl-shape-lib/elements-shacl-shape.xsl">
     
     <x:param name="translatePlainLiteralToStringTypesInSHACL" select="fn:false()"/>
+    <x:param name="enableGenerationOfSkosConcept" select="true()"/>
+    <x:param name="enableGenerationOfConceptSchemes" select="true()"/>
 
     <x:scenario label="Scenario for testing template with match 'element[@xmi:type = 'uml:Class']">
         <x:context href="../../testData/ePO-CM_v.3.0.1.eap.xmi" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[224]"/>
@@ -155,4 +157,104 @@
         <x:expect label="there is a correct URI" test="/rdf:Description/@rdf:about = 'http://data.europa.eu/a4g/data-shape#epo-LotAwardOutcome-epo-hasAwardedValue'"/>
         <x:expect label="there is a correct URI" test="/rdf:Description[2]/@rdf:about = 'http://data.europa.eu/a4g/data-shape#epo-LotAwardOutcome-epo-hasAwardedEstimatedValue'"/>
     </x:scenario>
+    
+    <x:scenario label="Scenario for enumerationItem">
+        <x:scenario label="enumeration with items">
+        <x:call template="enumerationItem">
+            <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[244]"/>
+        </x:call>   
+        <x:expect label="there is a rdf:Description " test="count(rdf:Description) = 1 "/>
+        <x:expect label="there is a rdf:type" test="boolean(rdf:Description/rdf:type)"/>
+        <x:expect label="there is sh:property" test="boolean(rdf:Description/sh:property)"/>
+        <x:expect label="there is sh:path" test="boolean(rdf:Description/sh:property/sh:path)"/>
+        <x:expect label="there is sh:hasValue" test="boolean(rdf:Description/sh:property/sh:hasValue)"/>
+        <x:expect label="there is correct value for sh:hasValue resource" test="rdf:Description/sh:property/sh:hasValue/@rdf:resource = 'http://publications.europa.eu/resource/authority/accessibility'"/>
+    </x:scenario>
+        <x:scenario label="enumeration without items">
+            <x:call template="enumerationItem">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[243]"/>
+            </x:call>   
+            <x:expect label="there is a rdf:Description " test="count(rdf:Description) = 1 "/>
+            <x:expect label="there is correct value for rdf:about " test="rdf:Description/@rdf:about = 'http://data.europa.eu/a4g/data-shape#at-voc-access-rights-itemShape' "/>
+            <x:expect label="there is a rdf:type" test="boolean(rdf:Description/rdf:type)"/>
+            <x:expect label="there is sh:property" test="boolean(rdf:Description/sh:property)"/>
+            <x:expect label="there is sh:path" test="boolean(rdf:Description/sh:property/sh:path)"/>
+            <x:expect label="there is sh:hasValue" test="boolean(rdf:Description/sh:property/sh:hasValue)"/>
+            <x:expect label="there is correct value for sh:hasValue resource" test="rdf:Description/sh:property/sh:hasValue/@rdf:resource = 'http://publications.europa.eu/resource/authority/access-rights'"/>
+        </x:scenario>
+        
+    </x:scenario>
+    
+    <x:scenario label="Scenario for enumerationDependencyRangeShape">
+        <x:scenario label="enumeration with items - permissive">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" 
+                    href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[244]"/>
+            </x:call>    
+            <x:expect label="there is an rdf:Description" 
+                test="count(//rdf:Description) = 1"/>
+            <x:expect label="rdf:type is present" 
+                test="boolean(//rdf:Description/rdf:type)"/>
+            <x:expect label="sh:path is present" 
+                test="boolean(//rdf:Description/sh:path)"/>
+            <x:expect label="sh:class is present" 
+                test="boolean(//rdf:Description/sh:class)"/>
+            <x:expect label="correct rdf:about attribute" 
+                test="//rdf:Description/@rdf:about = 'http://data.europa.eu/a4g/data-shape#epo-StrategicProcurement-epo-includesAccessibilityCriterion'"/>
+            <x:expect label="correct rdf:type resource" 
+                test="//rdf:Description/rdf:type/@rdf:resource = 'http://www.w3.org/ns/shacl#PropertyShape'"/>
+            <x:expect label="correct sh:path resource" 
+                test="//rdf:Description/sh:path/@rdf:resource = 'http://data.europa.eu/a4g/ontology#includesAccessibilityCriterion'"/>
+            <x:expect label="correct sh:class resource" 
+                test="//rdf:Description/sh:class/@rdf:resource = 'http://www.w3.org/2004/02/skos/core#Concept'"/>
+        </x:scenario>
+        <x:scenario label="enumeration with items - restrictive ">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[250]"/>
+            </x:call>   
+            <x:expect label="there is a rdf:Description for each dependency" test="count(rdf:Description) = 2"/>
+            <x:expect label="there is a rdf:type" test="boolean(rdf:Description/rdf:type)"/>
+            <x:expect label="there is sh:node" test="boolean(rdf:Description/sh:node)"/>
+            <x:expect label="there is sh:path" test="boolean(rdf:Description/sh:path)"/>
+            <x:expect label="there is correct value for sh:node resource" test="rdf:Description[1]/sh:node/@rdf:resource = 'http://data.europa.eu/a4g/data-shape#at-voc-contract-nature-itemShape'"/>
+            <x:expect label="there is correct value for sh:path resource" test="rdf:Description[1]/sh:path/@rdf:resource = 'http://data.europa.eu/a4g/ontology#hasContractNatureType'"/>
+            <x:expect label="there is correct value for rdf:type resource" test="rdf:Description[1]/rdf:type/@rdf:resource = 'http://www.w3.org/ns/shacl#PropertyShape'"/>
+        </x:scenario>
+        <x:scenario label="enumeration with multiple dependencies and no items - permissive">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" 
+                    href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[243]"/>
+            </x:call>   
+            <x:expect label="there are exactly 2 rdf:Description elements" 
+                test="count(//rdf:Description) = 2"/>
+            <x:expect label="correct rdf:about for first description" 
+                test="//rdf:Description[1]/@rdf:about = 'http://data.europa.eu/a4g/data-shape#epo-sub-Response-cccev-confidentialityLevelType'"/>
+            <x:expect label="correct rdf:about for second description" 
+                test="//rdf:Description[2]/@rdf:about = 'http://data.europa.eu/a4g/data-shape#cccev-Evidence-cccev-confidentialityLevelType'"/>
+            <x:expect label="rdf:type exists in both descriptions" 
+                test="count(//rdf:Description/rdf:type) = 2"/>
+            <x:expect label="correct sh:path for both descriptions" 
+                test="count(//rdf:Description[sh:path[@rdf:resource = 'http://data.europa.eu/m8g/confidentialityLevelType']]) = 2"/>
+            <x:expect label="correct sh:class for both descriptions" 
+                test="count(//rdf:Description[sh:class[@rdf:resource = 'http://www.w3.org/2004/02/skos/core#Concept']]) = 2"/>
+        </x:scenario>
+        
+        <x:scenario label="enumeration with no items - restrictive">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" 
+                    href="../../testData/ePO-core-4.2.0.xml" 
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[280]"/>
+            </x:call>   
+            <x:expect label="there is a rdf:Description for each dependency" test="count(rdf:Description) = 4"/>
+            <x:expect label="there is a rdf:type" test="boolean(rdf:Description/rdf:type)"/>
+            <x:expect label="there is sh:node" test="boolean(rdf:Description/sh:node)"/>
+            <x:expect label="there is sh:path" test="boolean(rdf:Description/sh:path)"/>
+            <x:expect label="there is correct value for sh:node resource" test="rdf:Description[1]/sh:node/@rdf:resource = 'http://data.europa.eu/a4g/data-shape#at-voc-permission-itemShape'"/>
+            <x:expect label="there is correct value for sh:path resource" test="rdf:Description[1]/sh:path/@rdf:resource = 'http://data.europa.eu/a4g/ontology#hasVariantPermission'"/>
+            <x:expect label="there is correct value for rdf:type resource" test="rdf:Description[1]/rdf:type/@rdf:resource = 'http://www.w3.org/ns/shacl#PropertyShape'"/>
+        </x:scenario>
+        
+    </x:scenario>
 </x:description>
diff --git a/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shapes-no-generation-enumerations.xspec b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shapes-no-generation-enumerations.xspec
new file mode 100644
index 0000000..922f405
--- /dev/null
+++ b/test/unitTests/test-shacl-shape-lib/test-elements-shacl-shapes-no-generation-enumerations.xspec
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<x:description xmlns:x="http://www.jenitennison.com/xslt/xspec"
+    xmlns:fn="http://www.w3.org/2005/xpath-functions"
+    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:owl="http://www.w3.org/2002/07/owl#"
+    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+    xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:dct="http://purl.org/dc/terms/"
+    xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:sh="http://www.w3.org/ns/shacl#"
+    stylesheet="../../../src/shacl-shape-lib/elements-shacl-shape.xsl">
+
+    <x:param name="enableGenerationOfSkosConcept" select="false()"/>
+
+    <x:scenario label="Scenario for enumerationDependencyRangeShape when enableGenerationOfSkosConcept is false">
+        <x:scenario label="enumeration with items - permissive">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml"
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[244]"/>
+            </x:call>
+            <x:expect label="there is no output" select="()"/>
+        </x:scenario>
+        <x:scenario label="enumeration with items - restrictive ">
+            <x:call template="enumerationDependencyRangeShape">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml"
+                    select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[250]"/>
+            </x:call>
+            <x:expect label="there is no output" select="()"/>
+            <x:scenario label="enumeration with multiple dependencies and no items - permissive">
+                <x:call template="enumerationDependencyRangeShape">
+                    <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml"
+                        select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[243]"/>
+                </x:call>
+                <x:expect label="there is no output" select="()"/>
+            </x:scenario>
+
+            <x:scenario label="enumeration with no items - restrictive">
+                <x:call template="enumerationDependencyRangeShape">
+                    <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml"
+                        select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[280]"/>
+                </x:call>
+                <x:expect label="there is no output" select="()"/>
+            </x:scenario>
+
+        </x:scenario>
+    </x:scenario>
+    
+    <x:scenario label="Scenario for enumerationItem when enableGenerationOfSkosConcept is false">
+        <x:scenario label="enumeration with items">
+            <x:call template="enumerationItem">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[244]"/>
+            </x:call>   
+            <x:expect label="there is no output" select="()"/> 
+        </x:scenario>
+        <x:scenario label="enumeration without items">
+            <x:call template="enumerationItem">
+                <x:param name="enumeration" href="../../testData/ePO-core-4.2.0.xml" select="/xmi:XMI/xmi:Extension[1]/elements[1]/element[243]"/>
+            </x:call>   
+            <x:expect label="there is no output" select="()"/> 
+        </x:scenario>
+        
+    </x:scenario>
+
+</x:description>