diff --git a/releases/1.2.1/dcat-ap_1.2.1_shacl_mdr-vocabularies.shape.ttl b/releases/1.2.1/dcat-ap_1.2.1_shacl_mdr-vocabularies.shape.ttl
index 55c6a18..48cba44 100644
--- a/releases/1.2.1/dcat-ap_1.2.1_shacl_mdr-vocabularies.shape.ttl
+++ b/releases/1.2.1/dcat-ap_1.2.1_shacl_mdr-vocabularies.shape.ttl
@@ -1,449 +1,341 @@
-# baseURI: http://data.europa.eu/r5r/mdrcv
-# imports: http://creativecommons.org/ns
-# imports: http://datashapes.org/dash
-# imports: http://purl.org/dc/terms/
-# imports: http://topbraid.org/schema/
-# imports: http://vocab.deri.ie/void
-# imports: http://www.w3.org/2004/02/skos/core
-# imports: http://www.w3.org/2006/vcard/ns
-# imports: http://www.w3.org/2008/05/skos-xl
-# imports: http://www.w3.org/ns/adms
-# imports: http://www.w3.org/ns/dcat
-# imports: http://www.w3.org/ns/org#
-# imports: http://xmlns.com/foaf/0.1/
-
-@prefix : <http://data.europa.eu/r5r/mdrcv#> .
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix : <http://data.europa.eu/r5r#> .
 @prefix adms: <http://www.w3.org/ns/adms#> .
-@prefix dash: <http://datashapes.org/dash#> .
+@prefix cc: <http://creativecommons.org/ns#> .
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
 @prefix dct: <http://purl.org/dc/terms/> .
 @prefix foaf: <http://xmlns.com/foaf/0.1/> .
+@prefix lcon: <http://www.w3.org/ns/locn#> .
 @prefix org: <http://www.w3.org/ns/org#> .
 @prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix odrl: <http://www.w3.org/ns/odrl/2/> .
 @prefix prov: <http://www.w3.org/ns/prov#> .
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix schema: <http://schema.org/> .
 @prefix sh: <http://www.w3.org/ns/shacl#> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
-@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#> .
 @prefix spdx: <http://spdx.org/rdf/terms#> .
-@prefix tosh: <http://topbraid.org/tosh#> .
+@prefix time: <http://www.w3.org/2006/time#> .
 @prefix vcard: <http://www.w3.org/2006/vcard/ns#> .
-@prefix xml: <http://www.w3.org/XML/1998/namespace> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix dcatap: <http://data.europa.eu/r5r> .
+
+
+<http://data.europa.eu/r5r/mdr_shapes>
+    dcat:accessURL <https://joinup.ec.europa.eu/solution/dcat-application-profile-data-portals-europe/distribution/dcat-ap-200-shacl-shapes>;
+    dcat:downloadURL <https://github.com/SEMICeu/DCAT-AP/raw/master/releases/1.2.1/dcat-ap_1.2.1_shacl_mdr-vocabularies.shape.ttl> ;
+    dcatap:availability <http://data.europa.eu/r5r/stable> ;
+    dct:format <http://publications.europa.eu/resource/authority/file-type/RDF_TURTLE> ;
+    dct:conformsTo <https://www.w3.org/TR/shacl> ;
+    dct:creator [
+        rdfs:seeAlso <https://www.linkedin.com/in/bert-van-nuffelen-a349634/> ;
+        org:memberOf <https://tenforce.com> ;
+        foaf:homepage <https://www.linkedin.com/in/bert-van-nuffelen-a349634/> ;
+        foaf:name "Bert Van Nuffelen"
+    ], [
+        rdfs:seeAlso <https://www.ails.ece.ntua.gr/people/natasa> ;
+        org:memberOf <https://www.ails.ece.ntua.gr/> ;
+        foaf:homepage <https://www.ails.ece.ntua.gr/people/natasa> ;
+        foaf:name "Natasa Sofou"
+    ], [
+        rdfs:seeAlso <http://eugeniu.costezki.ro#me> ;
+        org:memberOf <http://publications.europa.eu/resource/authority/corporate-body/PUBL> ;
+        foaf:homepage <http://costezki.ro> ;
+        foaf:name "Eugeniu Costetchi"
+    ], [
+        rdfs:seeAlso <http://makxdekkers.com/#me> ;
+        org:memberOf <http://ami-consult.com/#id> ;
+        foaf:homepage <http://makxdekkers.com/> ;
+        foaf:name "Makx Dekkers"
+    ], [
+        rdfs:seeAlso <http://nikosloutas.com/> ;
+        org:memberOf <http://www.pwc.com/gx/en/eu-institutions-services> ;
+        foaf:homepage <http://nikosloutas.com/> ;
+        foaf:name "Nikolaos Loutas"
+    ], [
+        rdfs:seeAlso <http://www.deri.ie/users/vassilios-peristeras/> ;
+        org:memberOf <http://publications.europa.eu/resource/authority/corporate-body/COM> ;
+        foaf:homepage <http://www.deri.ie/users/vassilios-peristeras/> ;
+        foaf:name "Vassilios Peristeras"
+    ] ;
+    dct:license <https://creativecommons.org/licenses/by/4.0> ;
+    cc:attributionURL <http://ec.europa.eu/> ;
+    dct:modified "2019-12-19"^^xsd:date ;
+    dct:publisher <http://publications.europa.eu/resource/authority/corporate-body/DIGIT> ;
+    dct:relation <https://joinup.ec.europa.eu/solution/dcat-application-profile-data-portals-europe/release/121> ;
+    dct:description "This document specifies the controlled vocabulary constraints on properties expressed by DCAT-AP in SHACL."@en ;
+    dct:title "Controlled Vocabulary Constraints of DCAT Application Profile for Data Portals in Europe"@en ;
+    owl:versionInfo "1.2.1" ;
+    foaf:homepage <https://joinup.ec.europa.eu/solution/dcat-application-profile-data-portals-europe/release/121> ;
+    foaf:maker [
+        foaf:mbox <mailto:contact@semic.eu> ;
+        foaf:name "DCAT-AP Working Group" ;
+        foaf:page <https://github.com/SEMICeu/DCAT-AP>, <https://joinup.ec.europa.eu/node/64331>
+    ] .
+
 
-<http://data.europa.eu/r5r/mdrcv>
-  rdf:type owl:Ontology ;
-  adms:versionNotes "Change log for DCAT-AP v1.2.1.: Controlled Vocabularies and UML schema: Updated references to Publications Office Metadata Registry in DCAT-AP v1.2.1 published .DOC, .PDF and .ODT and updated DCAT-AP UML schema by changing the order of startDate and endDate in dct:PeriodOfTime in the diagram."@en ;
-  dct:conformsTo <https://joinup.ec.europa.eu/document/process-and-methodology-developing-core-vocabularies> ;
-  dct:creator [
-      rdfs:seeAlso <http://eugeniu.costezki.ro#me> ;
-      org:memberOf <http://publications.europa.eu/resource/authority/corporate-body/PUBL> ;
-      foaf:homepage <http://costezki.ro> ;
-      foaf:name "Eugeniu Costetchi" ;
-    ] ;
-  dct:creator [
-      rdfs:seeAlso <http://makxdekkers.com/#me> ;
-      org:memberOf <http://ami-consult.com/#id> ;
-      foaf:homepage <http://makxdekkers.com/> ;
-      foaf:name "Makx Dekkers" ;
-    ] ;
-  dct:creator [
-      rdfs:seeAlso <http://nikosloutas.com/> ;
-      org:memberOf <http://www.pwc.com/gx/en/eu-institutions-services> ;
-      foaf:homepage <http://nikosloutas.com/> ;
-      foaf:name "Nikolaos Loutas" ;
-    ] ;
-  dct:creator [
-      rdfs:seeAlso <http://www.deri.ie/users/vassilios-peristeras/> ;
-      org:memberOf <http://publications.europa.eu/resource/authority/corporate-body/COM> ;
-      foaf:homepage <http://www.deri.ie/users/vassilios-peristeras/> ;
-      foaf:name "Vassilios Peristeras" ;
-    ] ;
-  dct:license <https://joinup.ec.europa.eu/licence/isa-open-metadata-licence-v11> ;
-  dct:modified "2019-05-28"^^xsd:date ;
-  dct:publisher <http://publications.europa.eu/resource/authority/corporate-body/COM> ;
-  dct:relation <http://data.europa.eu/w21/6be4d036-2e6d-4528-a888-0e9a0e29c579> ;
-  dct:rightsHolder <http://publications.europa.eu/resource/authority/corporate-body/EURUN> ;
-  rdfs:comment "This document specifies controlled vocabulary constraints on properties used in the DCAT Application (DCAT-AP)."@en ;
-  rdfs:label "Controlled Vocabulary Constraints of DCAT Application Profile for Data Portals in Europe"@en ;
-  owl:imports <http://creativecommons.org/ns> ;
- owl:imports <http://datashapes.org/dash> ;
-  owl:imports dct: ;
-  owl:imports <http://topbraid.org/schema/> ;
-  owl:imports <http://vocab.deri.ie/void> ;
-  owl:imports <http://www.w3.org/2004/02/skos/core> ;
-  owl:imports <http://www.w3.org/2006/vcard/ns> ;
-  owl:imports <http://www.w3.org/2008/05/skos-xl> ;
-  owl:imports <http://www.w3.org/ns/adms> ;
-  owl:imports <http://www.w3.org/ns/dcat> ;
-  owl:imports org: ;
-  owl:imports foaf: ;
-  owl:versionInfo "1.2.1" ;
-  foaf:depiction <https://github.com/SEMICeu/DCAT-AP/blob/master/releases/1.2.1/DCAT-AP_1.2.1.png> ;
-  foaf:homepage <http://data.europa.eu/w21/6be4d036-2e6d-4528-a888-0e9a0e29c579> ;
-  foaf:logo <https://joinup.ec.europa.eu/sites/default/files/imagecache/community_logo/DCAT_application_profile_for_European_data_portals_logo_0.png> ;
-  foaf:maker [
-      foaf:mbox <mailto:contact@semic.eu> ;
-      foaf:name "DCAT-AP Working Group" ;
-      foaf:page <https://github.com/SEMICeu/DCAT-AP> ;
-      foaf:page <https://joinup.ec.europa.eu/node/64331> ;
-] ;
-.
 :ContinentRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Continent restriction" ;
-  rdfs:label "Continent restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/continent> ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Continent restriction" ;
+    rdfs:label "Continent restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/continent> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :CorporateBodyRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Corporate Body Restriction" ;
-  rdfs:label "Corporate Body Restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/corporate-body> ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Corporate Body Restriction" ;
+    rdfs:label "Corporate Body Restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/corporate-body> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :CountryRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Country restriction" ;
-  rdfs:label "Country restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/country> ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Country restriction" ;
+    rdfs:label "Country restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/country> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :DataThemeRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Data Theme Restriction" ;
-  rdfs:label "Data Theme Restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/data-theme> ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Data Theme Restriction" ;
+    rdfs:label "Data Theme Restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/data-theme> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :FileTypeRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "File Type Restriction" ;
-  rdfs:label "File Type Restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/file-type> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "File Type Restriction" ;
+    rdfs:label "File Type Restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/file-type> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :FrequencyRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Frequency Restriction" ;
-  rdfs:label "Frequency Restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/frequency> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Frequency Restriction" ;
+    rdfs:label "Frequency Restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/frequency> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :GeoNamesRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Geo names restriction" ;
-  rdfs:label "Geo names restriction" ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://sws.geonames.org> ;
-      sh:minCount 1 ;
+    a sh:NodeShape ;
+    rdfs:comment "Geo names restriction" ;
+    rdfs:label "Geo names restriction" ;
+    sh:property [
+        sh:hasValue <http://sws.geonames.org> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
 
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
 :LanguageRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Language Restriction" ;
-  rdfs:label "Language Restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/language> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Language Restriction" ;
+    rdfs:label "Language Restriction" ;
+    sh:property [
+        sh:hasValue <http://publications.europa.eu/resource/authority/language> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :LicenceTypeRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Licence type restriction" ;
-  rdfs:label "Licence type restriction" ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://purl.org/adms/licencetype/1.0> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Licence type restriction" ;
+    rdfs:label "Licence type restriction" ;
+    sh:property [
+        sh:hasValue <http://purl.org/adms/licencetype/1.0> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :PlaceRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Place restriction" ;
-  rdfs:label "Place restriction" ;
-  rdfs:subClassOf rdfs:Resource ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/place> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Place restriction" ;
+    rdfs:label "Place restriction" ;
+    sh:property [
+        sh:class skos:ConceptScheme ;
+        sh:hasValue <http://publications.europa.eu/resource/authority/place> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :PublisherTypeRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Publisher type restriction" ;
-  rdfs:label "Publisher type restriction" ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://purl.org/adms/publishertype/1.0> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Publisher type restriction" ;
+    rdfs:label "Publisher type restriction" ;
+    sh:property [
+        sh:class skos:ConceptScheme ;
+        sh:hasValue <http://purl.org/adms/publishertype/1.0> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
+
 :StatusRestriction
-  rdf:type sh:NodeShape ;
-  rdfs:comment "Status restriction" ;
-  rdfs:label "Status restriction" ;
-  owl:versionInfo "1" ;
-  sh:property [
-      sh:path skos:inScheme ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://purl.org/adms/status/1.0> ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:IRI ;
-    ] ;
-.
-dct:LicenseDocument
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:type ;
-      sh:class skos:Concept ;
-      sh:nodeKind sh:IRI ;
-      sh:node :LicenceTypeRestriction ;
-    ] ;
-.
-dcat:Catalog
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:language ;
-      sh:class skos:Concept ;
-      sh:nodeKind sh:IRI ;
-      sh:node :LanguageRestriction ;
-    ] ;
-  sh:property [
-      sh:path dct:publisher ;
-      sh:class skos:Concept ;
-      sh:nodeKind sh:IRI ;
-      sh:node :CorporateBodyRestriction ;
-    ] ;
-  sh:property [
-      sh:path dct:spatial ;
-      sh:class skos:Concept ;
-      sh:nodeKind sh:IRI ;
-      sh:node [
-          rdf:type sh:NodeShape ;
-          sh:or (
-              :CountryRestriction
-              :PlaceRestriction
-              :ContinentRestriction
-              :GeoNamesRestriction
-            ) ;
-        ] ;
-    ] ;
-  sh:property [
-      sh:path dcat:themeTaxonomy ;
-      sh:class skos:ConceptScheme ;
-      sh:hasValue <http://publications.europa.eu/resource/authority/data-theme> ;
-            sh:nodeKind sh:IRI ;
-    ] ;
-.
+    a sh:NodeShape ;
+    rdfs:comment "Status restriction" ;
+    rdfs:label "Status restriction" ;
+    sh:property [
+        sh:class skos:ConceptScheme ;
+        sh:hasValue <http://purl.org/adms/status/1.0> ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:IRI ;
+        sh:path skos:inScheme
+    ] .
 
-dcat:Dataset
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:accrualPeriodicity ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :FrequencyRestriction ;
-    ] ;
-  sh:property [
-      sh:path dct:language ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :LanguageRestriction ;
-    ] ;
-  sh:property [
-      sh:path dct:publisher ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :CorporateBodyRestriction ;
-    ] ;
-  sh:property [
-      sh:path dct:spatial ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node [
-          rdf:type sh:NodeShape ;
-          sh:or (
-              :CountryRestriction
-              :PlaceRestriction
-              :ContinentRestriction
-              :GeoNamesRestriction
-            ) ;
-        ] ;
-    ] ;
-  sh:property [
-      sh:path dcat:theme ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :DataThemeRestriction ;
-    ] ;
-.
-dcat:Distribution
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:format ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :FileTypeRestriction ;
-    ] ;
-  sh:property [
-      sh:path adms:status ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:node :StatusRestriction ;
-    ] ;
-.
-foaf:Agent
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:type ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:maxCount 1 ;
-      sh:node :PublisherTypeRestriction ;
-    ] ;
+
+:LicenseDocument_ShapeCV
+    a sh:NodeShape ;
     sh:property [
-      sh:path foaf:name ;
-      sh:minCount 1 ;
-      sh:nodeKind sh:Literal ;
-      sh:severity sh:Violation ;
+        sh:node :LicenceTypeRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:type
     ] ;
-.
+    sh:targetClass dct:LicenseDocument.
 
-adms:Identifier
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path skos:notation ;
-      sh:maxCount 1 ;
-            sh:nodeKind sh:Literal ;
-      sh:severity sh:Violation ;
-    ] ;
-.
 
-skos:Concept
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path skos:prefLabel ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:Literal ;
-      sh:severity sh:Violation ;
-    ] ;
-.
-skos:ConceptScheme
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:title ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:Literal ;
-      sh:severity sh:Violation ;
-    ] ;
-.
+:Catalog_ShapeCV
+    a sh:NodeShape ;
+    sh:property [
+        sh:node :LanguageRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:language ;
+	sh:description "A non EU managed concept is used to indicate a language. If no corresponding can be found inform the maintainer of the EU language NAL" ; 
+        sh:severity sh:Violation
+    ], [
+        sh:node :CorporateBodyRestriction ;
+        sh:node :Publisher_ShapeCV ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:publisher ;
+	sh:description "A non EU managed concept is used to indicate the publisher, check if a corresponding exists in the EU corporates bodies NAL" ; 
+        sh:severity sh:Warning
+    ], [
+        sh:node [
+            a sh:NodeShape ;
+            sh:or (:CountryRestriction
+                :PlaceRestriction
+                :ContinentRestriction
+                :GeoNamesRestriction
+            )
+        ] ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:spatial ;
+	sh:description "A non managed concept is used to indicate a spatial description, check if a corresponding exists" ; 
+        sh:severity sh:Warning
+    ], [
+        sh:hasValue <http://publications.europa.eu/resource/authority/data-theme> ;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:themeTaxonomy ;
+	sh:description "Multiple themes can be used but at least <http://publications.europa.eu/resource/authority/data-theme> should be present" ;
+        sh:severity sh:Warning
+    ] ;
+    sh:targetClass dcat:Catalog.
 
-spdx:Checksum
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path spdx:algorithm ;
-      sh:maxCount 1 ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:IRI ;
-      sh:severity sh:Violation ;
-    ] ;
-  sh:property [
-      sh:path spdx:checksumValue ;
-      sh:maxCount 1 ;
-      sh:minCount 1 ;
-            sh:nodeKind sh:Literal ;
-      sh:severity sh:Violation ;
-    ] ;
-.
+:Dataset_ShapeCV
+    a sh:NodeShape ;
+    sh:property [
+        sh:node :FrequencyRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:accrualPeriodicity ;
+	sh:description "A non EU managed concept is used to indicate the accrualPeriodicity frequency. If no corresponding can be found inform the maintainer of the EU frequency NAL" ; 
+        sh:severity sh:Violation
+    ], [
+        sh:node :LanguageRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:language ;
+	sh:description "A non EU managed concept is used to indicate a language. If no corresponding can be found inform the maintainer of the EU language NAL" ; 
+        sh:severity sh:Violation
+    ], [
+        sh:node :CorporateBodyRestriction ;
+        sh:node :Publisher_ShapeCV ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:publisher ;
+	sh:description "A non EU managed concept is used to indicate the publisher, check if a corresponding exists in the EU corporates bodies NAL" ; 
+        sh:severity sh:Warning
+    ], [
+        sh:node [
+            a sh:NodeShape ;
+            sh:or (:CountryRestriction
+                :PlaceRestriction
+                :ContinentRestriction
+                :GeoNamesRestriction
+            )
+        ] ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:spatial ;
+	sh:description "A non managed concept is used to indicate a spatial description, check if a corresponding exists" ; 
+        sh:severity sh:Warning
+    ], [
+        sh:node :DataThemeRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:theme ;
+	sh:description "Multiple themes can be used but at least one concept of <http://publications.europa.eu/resource/authority/data-theme> should be present" ;
+        sh:severity sh:Warning
+    ] ;
+    sh:targetClass dcat:Dataset.
 
-dct:PeriodOfTime
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path schema:endDate ;
-      sh:maxCount 1 ;
-      sh:severity sh:Violation ;
-      sh:node :DateOrDateTimeDataType ;
-    ] ;
-  sh:property [
-      sh:path schema:startDate ;
-      sh:maxCount 1 ;
-      sh:severity sh:Violation ;
-      sh:node :DateOrDateTimeDataType ;
-    ] ;
-.
+# ------------------------------------------------------------------------------------------------------------------
+# The constraints for dcat:mediaType, dcat:compressFormat, dcat:packageFormat which are limited to the IANA codelist 
+# cannot be expressed in SHACL unless a copy in RDF for the IANA codelist is being created
+# ------------------------------------------------------------------------------------------------------------------
+:Distribution_ShapeCV
+    a sh:NodeShape ;
+    sh:property [
+        sh:node :FileTypeRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:format ;
+	sh:description "A non EU managed concept is used to indicate the format of the distribution. If no corresponding can be found inform the maintainer of the fileformat NAL." ; 
+        sh:severity sh:Violation
+    ], [
+        sh:node :LanguageRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:language ;
+	sh:description "A non EU managed concept is used to indicate a language. If no corresponding can be found inform the maintainer of the EU language NAL" ; 
+        sh:severity sh:Violation
+    ], [
+        sh:node :StatusRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path adms:status ;
+	sh:description "A non EU managed concept is used to indicate the status of the distribution. If no corresponding can be found inform the maintainer of the adms:status codelist." ; 
+        sh:severity sh:Violation
+    ] ;
+    sh:targetClass dcat:Distribution.
+
+
+:Publisher_ShapeCV
+    a sh:NodeShape ;
+    sh:property [
+        sh:node :PublisherTypeRestriction ;
+        sh:nodeKind sh:IRI ;
+        sh:path dct:type ;
+	sh:description "A non EU managed concept is used to indicate the type of the publisher. If no corresponding can be found inform the maintainer of the adms:publishertype codelist." ; 
+        sh:severity sh:Violation
+    ] .
 
-dct:LicenseDocument
-  rdf:type sh:NodeShape ;
-  sh:property [
-      sh:path dct:type ;
-      sh:class skos:Concept ;
-            sh:nodeKind sh:IRI ;
-      sh:severity sh:Violation ;
-    ] ;
-.