diff --git a/releases/3.0.0-draft/html/shacl/deprecateduris.ttl b/releases/3.0.0-draft/html/shacl/deprecateduris.ttl
index 8d9d418..dfa52a4 100644
--- a/releases/3.0.0-draft/html/shacl/deprecateduris.ttl
+++ b/releases/3.0.0-draft/html/shacl/deprecateduris.ttl
@@ -70,3 +70,24 @@
        sh:message "replace owl:versionInfo with dcat:version"@en
     ];
     sh:targetClass dcat:Dataset .
+
+
+#-------------------------------------------------------------------------
+# The shapes in this file cover all URI changes that require attention
+# by the catalogue owner.
+#
+# deprecated by the transition from version 2.x to 3.x
+# 
+#-------------------------------------------------------------------------
+
+
+:DatasetInverseProperties_Shape
+    a sh:NodeShape ;
+    rdfs:label "Dataset Deprecation properties"@en ;
+    sh:property [
+       sh:path dcat:isVersionOf ;
+       sh:severity sh:Warning ;
+       sh:message "dcat:isVersionOf is an inverse property and should only be used if dcat:hasVersion is present."@en
+    ];
+    sh:targetClass dcat:Dataset .
+
diff --git a/releases/3.0.0-draft/html/shacl/range.ttl b/releases/3.0.0-draft/html/shacl/range.ttl
index 0508e6e..1d5694d 100644
--- a/releases/3.0.0-draft/html/shacl/range.ttl
+++ b/releases/3.0.0-draft/html/shacl/range.ttl
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix : <http://data.europa.eu/r5r#> .
+@prefix : <https://semiceu.github.io/DCAT-AP/releases/3.0.0/html/shacl/range.ttl#> .
 @prefix adms: <http://www.w3.org/ns/adms#> .
 @prefix cc: <http://creativecommons.org/ns#> .
 @prefix dc: <http://purl.org/dc/elements/1.1/> .
@@ -21,63 +21,18 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix dcatap: <http://data.europa.eu/r5r> .
 
-<http://data.europa.eu/r5r/shacl_range>
-    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> ;
-    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 "2021-12-01"^^xsd:date ;
-    dct:publisher <http://publications.europa.eu/resource/authority/corporate-body/DIGIT> ;
-    dct:relation <https://joinup.ec.europa.eu/collection/semantic-interoperability-community-semic/solution/dcat-application-profile-data-portals-europe/release/210> ;
-    dct:description "This document specifies the range constraints for object properties by DCAT-AP in SHACL."@en ;
-    dct:title "The range constraints for object properties of DCAT Application Profile for Data Portals in Europe"@en ;
-    owl:versionInfo "2.1.1" ;
-    foaf:homepage <https://joinup.ec.europa.eu/collection/semantic-interoperability-community-semic/solution/dcat-application-profile-data-portals-europe/release/210> ;
-    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>
-    ] .
+<https://semiceu.github.io/DCAT-AP/releases/3.0.0/html/shacl/range.ttl> 
+    dct:description "This file contains the class range constraints for all properties in DCAT-AP"@en.
+
 
 
 
 #-------------------------------------------------------------------------
-# The shapes in this file cover all range constraints in DCAT-AP
+# The shapes in this file cover all class range constraints in DCAT-AP
 #
+# Depending on the exchange agreements these may be necessary to be part 
+# of the validation process. However they mostly figure in the semantical 
+# understanding of the ranges.
 # 
 #-------------------------------------------------------------------------
 
@@ -124,6 +79,10 @@
         sh:class dct:LinguisticSystem ;
         sh:path dct:language ;
         sh:severity sh:Violation
+    ], [
+  	sh:path dcatap:applicableLegislation;
+  	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
+        sh:severity sh:Violation
     ], [
         sh:class dct:LicenseDocument ;
         sh:path dct:license ;
@@ -184,20 +143,44 @@
     a sh:NodeShape ;
     rdfs:label "Data Service"@en ;
     sh:property [
-        sh:class dcat:Dataset ;
-        sh:path dcat:servesDataset ;
+        sh:class dct:RightsStatement ;
+        sh:path dct:accessRights ;
         sh:severity sh:Violation
     ], [
   	sh:path dcatap:applicableLegislation;
   	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
         sh:severity sh:Violation
+    ], [
+        sh:class dct:Standard ;
+        sh:path dct:conformsTo ;
+        sh:severity sh:Violation
+    ], [
+        sh:class vcard:Kind ;
+        sh:path dcat:contactPoint ;
+        sh:severity sh:Violation
+    ], [
+        sh:class dct:MediaTypeOrExtent ;
+        sh:path dct:format ;
+        sh:severity sh:Violation
+    ], [
+        sh:class foaf:Document ;
+        sh:path dcat:landingPage ;
+        sh:severity sh:Violation
     ], [
         sh:class dct:LicenseDocument ;
         sh:path dct:license ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:RightsStatement ;
-        sh:path dct:accessRights ;
+        sh:path dct:publisher ;
+  	sh:class foaf:Agent;
+        sh:severity sh:Violation
+    ], [
+        sh:class dcat:Dataset ;
+        sh:path dcat:servesDataset ;
+        sh:severity sh:Violation
+    ], [
+        sh:class skos:Concept ;
+        sh:path dcat:theme ;
         sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:DataService .
@@ -207,106 +190,110 @@
     a sh:NodeShape ;
     rdfs:label "Dataset"@en ;
     sh:property [
-        sh:class vcard:Kind ;
-        sh:path dcat:contactPoint ;
+        sh:class dct:RightsStatement ;
+        sh:path dct:accessRights ;
         sh:severity sh:Violation
     ], [
-        sh:class dcat:Distribution ;
-        sh:path dcat:distribution ;
+  	sh:path dcatap:applicableLegislation;
+  	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
         sh:severity sh:Violation
     ], [
-        sh:class foaf:Agent ;
-        sh:path dct:publisher ;
+        sh:class dct:Standard ;
+        sh:path dct:conformsTo ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:Location ;
-        sh:path dct:spatial ;
+        sh:class vcard:Kind ;
+        sh:path dcat:contactPoint ;
         sh:severity sh:Violation
     ], [
-	sh:class dct:PeriodOfTime ;
-        sh:path dct:temporal ;
+        sh:class foaf:Agent ;
+        sh:path dct:creator ;
         sh:severity sh:Violation
     ], [
-        sh:class skos:Concept ;
-        sh:path dcat:theme ;
+        sh:class dcat:Distribution ;
+        sh:path dcat:distribution ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:RightsStatement ;
-        sh:path dct:accessRights ;
+        sh:class foaf:Document ;
+        sh:path foaf:page ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:Frequency ;
-        sh:path dct:accrualPeriodicity ;
+	sh:path dct:accrualPeriodicity;
+  	sh:class dct:Frequency;
         sh:severity sh:Violation
     ], [
-        sh:class dct:Standard ;
-        sh:path dct:conformsTo ;
+        sh:class dct:Location ;
+        sh:path dct:spatial ;
         sh:severity sh:Violation
     ], [
         sh:class dcat:Dataset ;
         sh:path dct:hasVersion ;
         sh:severity sh:Violation
     ], [
-        sh:class dcat:Dataset ;
-        sh:path dct:isVersionOf ;
+        sh:class dcat:DatasetSeries ;
+        sh:path dcat:inSeries ;
+        sh:severity sh:Violation
+    ], [
+        sh:class foaf:Document ;
+        sh:path dcat:landingPage ;
         sh:severity sh:Violation
     ], [
         sh:class dct:LinguisticSystem ;
         sh:path dct:language ;
         sh:severity sh:Violation
+    ], [
+        sh:class adms:Identifier ;
+        sh:path adms:identifier ;
+        sh:severity sh:Violation
     ], [
         sh:class dct:ProvenanceStatement ;
         sh:path dct:provenance ;
         sh:severity sh:Violation
     ], [
-        sh:class dcat:Dataset ;
-        sh:path dct:source ;
+        sh:class foaf:Agent ;
+        sh:path dct:publisher ;
         sh:severity sh:Violation
     ], [
-        sh:class skos:Concept ;
-        sh:path dct:type ;
+        sh:class prov:Attribution ;
+        sh:path prov:qualifiedAttribution ;
         sh:severity sh:Violation
     ], [
-        sh:class adms:Identifier ;
-        sh:path adms:identifier ;
+        sh:class dcat:Relationship ;
+        sh:path dcat:qualifiedRelation ;
         sh:severity sh:Violation
     ], [
         sh:class dcat:Distribution ;
         sh:path adms:sample ;
         sh:severity sh:Violation
     ], [
-        sh:class foaf:Document ;
-        sh:path dcat:landingPage ;
+        sh:class dcat:Dataset ;
+        sh:path dct:source ;
         sh:severity sh:Violation
     ], [
-        sh:class foaf:Document ;
-        sh:path foaf:page ;
+	sh:class dct:PeriodOfTime ;
+        sh:path dct:temporal ;
         sh:severity sh:Violation
     ], [
-        sh:class dcat:Relationship ;
-        sh:path dcat:qualifiedRelation ;
+        sh:class skos:Concept ;
+        sh:path dcat:theme ;
         sh:severity sh:Violation
     ], [
-        sh:class prov:Attribution ;
-        sh:path prov:qualifiedAttribution ;
+        sh:class skos:Concept ;
+        sh:path dct:type ;
         sh:severity sh:Violation
     ], [
         sh:class prov:Activity ;
         sh:path prov:wasGeneratedBy ;
         sh:severity sh:Violation
-    ], [
-        sh:class foaf:Agent ;
-        sh:path dct:creator ;
-        sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:Dataset .
 
 
 :DcatResource_Shape
     a sh:NodeShape ;
-    rdfs:comment "the union of Catalog, Dataset and DataService" ;
+    rdfs:comment "the union of Catalog, Dataset, DataService or Dataset Series" ;
     rdfs:label "dcat:Resource" ;
-    sh:message "The node is either a Catalog, Dataset or a DataService" ;
+    sh:message "The node is either a Catalog, Dataset, DataService or a Dataset Series" ;
     sh:or ([
             sh:class dcat:Catalog
         ]
@@ -316,66 +303,73 @@
         [
             sh:class dcat:DataService
         ]
+        [
+            sh:class dcat:DatasetSeries
+        ]
     ) .
 
 :Distribution_Shape
     a sh:NodeShape ;
     rdfs:label "Distribution"@en ;
     sh:property [
-        sh:class dct:Standard ;
-        sh:path dct:conformsTo ;
+        sh:class dcat:DataService ;
+        sh:path dcat:accessService ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:LinguisticSystem ;
-        sh:path dct:language ;
+  	sh:path dcatap:applicableLegislation;
+  	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
         sh:severity sh:Violation
     ], [
-        sh:class dct:RightsStatement ;
-        sh:path dct:rights ;
+        sh:class skos:Concept ;
+        sh:path dcatap:availability ;
         sh:severity sh:Violation
     ], [
         sh:class spdx:Checksum ;
         sh:path spdx:checksum ;
         sh:severity sh:Violation
-    ], [
-        sh:class skos:Concept ;
-        sh:path adms:status ;
-        sh:severity sh:Violation
     ], [
         sh:class dct:MediaType ;
-        sh:path dcat:mediaType ;
+        sh:path dcat:compressFormat ;
         sh:severity sh:Violation
     ], [
         sh:class foaf:Document ;
         sh:path foaf:page ;
         sh:severity sh:Violation
+    ], [
+        sh:class dct:MediaTypeOrExtent ;
+        sh:path dct:format ;
+        sh:severity sh:Violation
     ], [
         sh:class odrl:Policy ;
         sh:path odrl:hasPolicy ;
         sh:severity sh:Violation
     ], [
-        sh:class dcat:DataService ;
-        sh:path dcat:accessService ;
+        sh:class dct:LinguisticSystem ;
+        sh:path dct:language ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:MediaType ;
-        sh:path dcat:compressFormat ;
+        sh:class dct:LicenseDocument ;
+        sh:path dct:license ;
+        sh:severity sh:Violation
+    ], [
+        sh:class dct:Standard ;
+        sh:path dct:conformsTo ;
         sh:severity sh:Violation
     ], [
         sh:class dct:MediaType ;
-        sh:path dcat:packageFormat ;
+        sh:path dcat:mediaType ;
         sh:severity sh:Violation
     ], [
-        sh:class skos:Concept ;
-        sh:path dcatap:availability ;
+        sh:class dct:MediaType ;
+        sh:path dcat:packageFormat ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:MediaTypeOrExtent ;
-        sh:path dct:format ;
+        sh:class dct:RightsStatement ;
+        sh:path dct:rights ;
         sh:severity sh:Violation
     ], [
-        sh:class dct:LicenseDocument ;
-        sh:path dct:license ;
+        sh:class skos:Concept ;
+        sh:path adms:status ;
         sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:Distribution .
@@ -432,20 +426,20 @@
   	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:spatial;
-  	sh:class dct:Location;
+  	sh:path dcat:contactPoint;
+  	sh:class vcard:Kind;
         sh:severity sh:Violation
     ], [
 	sh:path dct:accrualPeriodicity;
   	sh:class dct:Frequency;
         sh:severity sh:Violation
     ], [
-        sh:path dct:publisher ;
-  	sh:class foaf:Agent;
+  	sh:path dct:spatial;
+  	sh:class dct:Location;
         sh:severity sh:Violation
     ], [
-  	sh:path dcat:contactPoint;
-  	sh:class vcard:Kind;
+        sh:path dct:publisher ;
+  	sh:class foaf:Agent;
         sh:severity sh:Violation
     ], [
   	sh:path dct:temporal;
diff --git a/releases/3.0.0-draft/html/shacl/shapes.ttl b/releases/3.0.0-draft/html/shacl/shapes.ttl
index 7ffde56..d14ddee 100644
--- a/releases/3.0.0-draft/html/shacl/shapes.ttl
+++ b/releases/3.0.0-draft/html/shacl/shapes.ttl
@@ -1,5 +1,5 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix : <http://data.europa.eu/r5r/shacl_shapes#> .
+@prefix : <https://semiceu.github.io/DCAT-AP/releases/3.0.0/html/shacl/shapes.ttl#> .
 @prefix adms: <http://www.w3.org/ns/adms#> .
 @prefix cc: <http://creativecommons.org/ns#> .
 @prefix dcat: <http://www.w3.org/ns/dcat#> .
@@ -20,53 +20,17 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix dcatap: <http://data.europa.eu/r5r> .
 
-<http://data.europa.eu/r5r/shacl_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/cea5a96bb4a6f120c20b7a2b3fb4d86bcd725952/releases/2.0.0/Draft/dcat-ap_2.0.0_shacl_shapes.ttl> ;
-    dcatap:availability <http://data.europa.eu/r5r/stable> ;
+<https://semiceu.github.io/DCAT-AP/releases/3.0.0/html/shacl/shapes.ttl> 
     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"
-    ] ;
-    dct:license <https://creativecommons.org/licenses/by/4.0> ;
-    cc:attributionURL <http://ec.europa.eu/> ;
-    dct:modified "2021-12-01"^^xsd:date ;
-    dct:publisher <http://publications.europa.eu/resource/authority/corporate-body/DIGIT> ;
-    dct:relation <https://joinup.ec.europa.eu/collection/semantic-interoperability-community-semic/solution/dcat-application-profile-data-portals-europe/release/210> ;
-    dct:description "This document specifies the constraints on properties and classes expressed by DCAT-AP in SHACL."@en ;
-    dct:title "The constraints of DCAT Application Profile for Data Portals in Europe"@en ;
-    owl:versionInfo "3.0.0" ;
-    foaf:homepage <https://joinup.ec.europa.eu/collection/semantic-interoperability-community-semic/solution/dcat-application-profile-data-portals-europe/release/210> ;
-    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>
-    ] .
+    dct:description "This files specifies the core constraints on properties and classes expressed by DCAT-AP in SHACL."@en.
 
 
 
 #-------------------------------------------------------------------------
-# The shapes in this file cover all classes in DCAT-AP 2.1.1.
-# It covers all constraints that must be satisfied except those checking the ranges.
+# The shapes in this file cover all classes in DCAT-AP 3.0.0
+# It covers all constraints that must be satisfied except those verifying 
+# the class ranges. This can be found in a separate file.
 # 
 #-------------------------------------------------------------------------
 
@@ -135,6 +99,7 @@
     a sh:NodeShape ;
     rdfs:label "Catalog"@en ;
     sh:property [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:language ;
         sh:severity sh:Violation
     ], [
@@ -143,6 +108,7 @@
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:license ;
         sh:severity sh:Violation
     ], [
@@ -151,15 +117,13 @@
         sh:path dct:issued ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:spatial ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:hasPart ;
         sh:severity sh:Violation
-    ], [
-        sh:maxCount 1 ;
-        sh:path dct:isPartOf ;
-        sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
         sh:node :DateOrDateTimeDataType_Shape ;
@@ -167,24 +131,32 @@
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:rights ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:record ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:themeTaxonomy ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:service ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:catalog ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:maxCount 1 ;
         sh:path dct:creator ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:dataset ;
         sh:severity sh:Violation
     ], [
@@ -204,6 +176,7 @@
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path foaf:homepage ;
         sh:severity sh:Violation
     ] ;
@@ -235,7 +208,6 @@
     a sh:NodeShape ;
     rdfs:label "Checksum"@en ;
     sh:property [
-        sh:hasValue spdx:checksumAlgorithm_sha1 ;
         sh:maxCount 1 ;
         sh:minCount 1 ;
         sh:path spdx:algorithm ;
@@ -253,37 +225,69 @@
     a sh:NodeShape ;
     rdfs:label "Data Service"@en ;
     sh:property [
-        sh:minCount 1 ;
-        sh:nodeKind sh:Literal ;
-        sh:path dct:title ;
+        sh:maxCount 1 ;
+        sh:path dct:accessRights ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:severity sh:Violation
     ], [
   	sh:path dcatap:applicableLegislation;
   	sh:nodeKind sh:IRI;
         sh:severity sh:Violation
     ], [
-        sh:minCount 1 ;
+        sh:path dct:conformsTo ;
         sh:nodeKind sh:BlankNodeOrIRI ;
-        sh:path dcat:endpointURL ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:servesDataset ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:contactPoint ;
         sh:severity sh:Violation
     ], [
         sh:nodeKind sh:Literal ;
         sh:path dct:description ;
         sh:severity sh:Violation
+    ], [
+        sh:minCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:endpointURL ;
+        sh:severity sh:Violation
     ], [
         sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:endpointDescription ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:format ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:Literal ;
+        sh:path dcat:keyword ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:landingPage ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:maxCount 1 ;
         sh:path dct:license ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:maxCount 1 ;
-        sh:path dct:accessRights ;
+        sh:path dct:publisher ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:servesDataset ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:theme ;
+        sh:severity sh:Violation
+    ], [
+        sh:minCount 1 ;
+        sh:nodeKind sh:Literal ;
+        sh:path dct:title ;
         sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:DataService .
@@ -292,69 +296,74 @@
     a sh:NodeShape ;
     rdfs:label "Dataset"@en ;
     sh:property [
-        sh:minCount 1 ;
-        sh:nodeKind sh:Literal ;
-        sh:path dct:description ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:maxCount 1 ;
+        sh:path dct:accessRights ;
         sh:severity sh:Violation
     ], [
-  	sh:path dcatap:applicableLegislation;
-  	sh:nodeKind sh:IRI;
+        sh:nodeKind sh:IRI ;
+  	sh:class <http://data.europa.eu/eli/ontology#LegalResource>;
         sh:severity sh:Violation
     ], [
-        sh:minCount 1 ;
-        sh:nodeKind sh:Literal ;
-        sh:path dct:title ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:conformsTo ;
         sh:severity sh:Violation
     ], [
-        sh:nodeKind sh:Literal ;
-        sh:path dct:identifier ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:contactPoint ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:contactPoint ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:creator ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dcat:distribution ;
         sh:severity sh:Violation
     ], [
+        sh:minCount 1 ;
         sh:nodeKind sh:Literal ;
-        sh:path dcat:keyword ;
+        sh:path dct:description ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:publisher ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path foaf:page ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:spatial ;
+        sh:maxCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+	sh:path dct:accrualPeriodicity;
         sh:severity sh:Violation
     ], [
-        sh:path dct:temporal ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:spatial ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:theme ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:hasVersion ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:accessRights ;
+        sh:nodeKind sh:Literal ;
+        sh:path dct:identifier ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:accrualPeriodicity ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:inSeries ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:conformsTo ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:isReferencedBy ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:hasVersion ;
+        sh:nodeKind sh:Literal ;
+        sh:path dcat:keyword ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:isVersionOf ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:landingPage ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:issued ;
-        sh:severity sh:Violation ;
-        sh:shape :DateOrDateTimeDataType_Shape
-    ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path dct:language ;
         sh:severity sh:Violation
     ], [
@@ -363,64 +372,82 @@
         sh:severity sh:Violation ;
         sh:shape :DateOrDateTimeDataType_Shape
     ], [
-        sh:path dct:provenance ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path adms:identifier ;
         sh:severity sh:Violation
     ], [
         sh:nodeKind sh:BlankNodeOrIRI ;
-        sh:path dct:relation ;
+        sh:path dct:provenance ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:source ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:maxCount 1 ;
+        sh:path dct:publisher ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:type ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path prov:qualifiedAttribution ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:nodeKind sh:Literal ;
-        sh:path owl:versionInfo ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:qualifiedRelation ;
         sh:severity sh:Violation
     ], [
-        sh:nodeKind sh:Literal ;
-        sh:path adms:versionNotes ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:relation ;
         sh:severity sh:Violation
     ], [
-        sh:path adms:identifier ;
-        sh:severity sh:Violation
+        sh:maxCount 1 ;
+        sh:path dct:issued ;
+        sh:severity sh:Violation ;
+        sh:shape :DateOrDateTimeDataType_Shape
     ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
         sh:path adms:sample ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:landingPage ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:source ;
         sh:severity sh:Violation
     ], [
-        sh:path foaf:page ;
+        sh:datatype xsd:decimal ;
+	sh:maxCount 1 ;
+        sh:path dcat:spatialResolutionInMeters ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:qualifiedRelation ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:temporal ;
         sh:severity sh:Violation
     ], [
-        sh:nodeKind sh:BlankNodeOrIRI ;
-        sh:path dct:isReferencedBy ;
+        sh:datatype xsd:duration ;
+		sh:maxCount 1 ;
+        sh:path dcat:temporalResolution ;
         sh:severity sh:Violation
     ], [
-        sh:path prov:qualifiedAttribution ;
+        sh:nodeKind sh:IRI ;
+        sh:path dcat:theme ;
         sh:severity sh:Violation
     ], [
-        sh:path prov:wasGeneratedBy ;
+        sh:minCount 1 ;
+        sh:nodeKind sh:Literal ;
+        sh:path dct:title ;
         sh:severity sh:Violation
     ], [
-        sh:datatype xsd:duration ;
-		sh:maxCount 1 ;
-        sh:path dcat:temporalResolution ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:type ;
         sh:severity sh:Violation
     ], [
-        sh:datatype xsd:decimal ;
-		sh:maxCount 1 ;
-        sh:path dcat:spatialResolutionInMeters ;
+        sh:maxCount 1 ;
+        sh:nodeKind sh:Literal ;
+        sh:path dcat:version ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:creator ;
+        sh:nodeKind sh:Literal ;
+        sh:path adms:versionNotes ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path prov:wasGeneratedBy ;
         sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:Dataset .
@@ -458,108 +485,125 @@
         [
             sh:class dcat:DataService
         ]
+        [
+            sh:class dcat:DatasetSeries
+        ]
     ) .
 
 :Distribution_Shape
     a sh:NodeShape ;
     rdfs:label "Distribution"@en ;
     sh:property [
-        sh:path dct:conformsTo ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:accessService ;
+        sh:severity sh:Violation
+    ], [
+        sh:minCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI;
+        sh:path dcat:accessURL ;
         sh:severity sh:Violation
     ], [
+        sh:nodeKind sh:IRI ;
   	sh:path dcatap:applicableLegislation;
-  	sh:nodeKind sh:IRI;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:node :DateOrDateTimeDataType_Shape ;
-        sh:path dct:issued ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcatap:availability ;
         sh:severity sh:Violation
     ], [
-        sh:path dct:language ;
+        sh:datatype xsd:decimal ;
+        sh:maxCount 1 ;
+        sh:path dcat:byteSize ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:node :DateOrDateTimeDataType_Shape ;
-        sh:path dct:modified ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path spdx:checksum ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path dct:rights ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:compressFormat ;
         sh:severity sh:Violation
     ], [
         sh:nodeKind sh:Literal ;
-        sh:path dct:title ;
+        sh:path dct:description ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path spdx:checksum ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path foaf:page ;
+        sh:severity sh:Violation
+    ], [
+        sh:nodeKind sh:BlankNodeOrIRI;
+        sh:path dcat:downloadURL ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path adms:status ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:format ;
         sh:severity sh:Violation
     ], [
-        sh:datatype xsd:decimal ;
         sh:maxCount 1 ;
-        sh:path dcat:byteSize ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path odrl:hasPolicy ;
         sh:severity sh:Violation
     ], [
-        sh:nodeKind sh:BlankNodeOrIRI;
-        sh:path dcat:downloadURL ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:language ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path dcat:mediaType ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:license ;
         sh:severity sh:Violation
     ], [
-        sh:path foaf:page ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:conformsTo ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path odrl:hasPolicy ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:mediaType ;
         sh:severity sh:Violation
     ], [
-        sh:path dcat:accessService ;
+        sh:maxCount 1 ;
+        sh:node :DateOrDateTimeDataType_Shape ;
+        sh:path dct:modified ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path dcat:compressFormat ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dcat:packageFormat ;
         sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path dcat:packageFormat ;
+        sh:node :DateOrDateTimeDataType_Shape ;
+        sh:path dct:issued ;
         sh:severity sh:Violation
     ], [
-        sh:datatype xsd:duration ;
-		sh:maxCount 1 ;
-        sh:path dcat:temporalResolution ;
+        sh:maxCount 1 ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path dct:rights ;
         sh:severity sh:Violation
     ], [
         sh:datatype xsd:decimal ;
-		sh:maxCount 1 ;
+	sh:maxCount 1 ;
         sh:path dcat:spatialResolutionInMeters ;
         sh:severity sh:Violation
-    ], [
-        sh:minCount 1 ;
-        sh:nodeKind sh:BlankNodeOrIRI;
-        sh:path dcat:accessURL ;
-        sh:severity sh:Violation
-    ], [
-        sh:nodeKind sh:Literal ;
-        sh:path dct:description ;
-        sh:severity sh:Violation
     ], [
         sh:maxCount 1 ;
-        sh:path dcatap:availability ;
+        sh:nodeKind sh:BlankNodeOrIRI ;
+        sh:path adms:status ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:format ;
+        sh:datatype xsd:duration ;
+	sh:maxCount 1 ;
+        sh:path dcat:temporalResolution ;
         sh:severity sh:Violation
     ], [
-        sh:maxCount 1 ;
-        sh:path dct:license ;
+        sh:nodeKind sh:Literal ;
+        sh:path dct:title ;
         sh:severity sh:Violation
     ] ;
     sh:targetClass dcat:Distribution .
@@ -642,65 +686,61 @@
     ] ;
     sh:targetClass dcat:Relationship .
 
-#
-# 
-
-
 :DatasetSeries_Shape
     a sh:NodeShape ;
     rdfs:label "Dataset Series"@en ;
     sh:property [
-       sh:inversePath dcat:inSeries;
-       sh:minCount 1;
-       sh:nodeKind sh:BlankNodeOrIRI;
-       sh:severity sh:Warning
+        sh:minCount 1;
+        sh:nodeKind sh:BlankNodeOrIRI;
+        sh:inversePath dcat:inSeries;
+        sh:severity sh:Warning
     ], [
-  	sh:path dcatap:applicableLegislation;
   	sh:nodeKind sh:IRI;
+  	sh:path dcatap:applicableLegislation;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:spatial;
-  	sh:nodeKind sh:BlankNodeOrIRI;
-        sh:severity sh:Violation
-    ], [
-	sh:path dct:accrualPeriodicity;
-  	sh:maxCount 1;
   	sh:nodeKind sh:BlankNodeOrIRI;
+  	sh:path dcat:contactPoint;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:title;
-  	sh:nodeKind sh:Literal;
   	sh:minCount 1;
-        sh:severity sh:Violation
-    ], [
-  	sh:path dct:description;
   	sh:nodeKind sh:Literal;
-  	sh:minCount 1;
+  	sh:path dct:description;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:issued;
-        sh:node :DateOrDateTimeDataType_Shape ;
-  	sh:nodeKind sh:Literal;
   	sh:maxCount 1;
+  	sh:nodeKind sh:BlankNodeOrIRI;
+	sh:path dct:accrualPeriodicity;
+        sh:severity sh:Violation
+    ], [
+  	sh:nodeKind sh:BlankNodeOrIRI;
+  	sh:path dct:spatial;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:modified;
         sh:node :DateOrDateTimeDataType_Shape ;
-  	sh:nodeKind sh:Literal;
   	sh:maxCount 1;
+  	sh:nodeKind sh:Literal;
+  	sh:path dct:modified;
         sh:severity sh:Violation
     ], [
-        sh:path dct:publisher ;
         sh:maxCount 1 ;
   	sh:nodeKind sh:BlankNodeOrIRI;
+        sh:path dct:publisher ;
         sh:severity sh:Violation
     ], [
-  	sh:path dcat:contactPoint;
-  	sh:nodeKind sh:BlankNodeOrIRI;
+        sh:node :DateOrDateTimeDataType_Shape ;
+  	sh:maxCount 1;
+  	sh:nodeKind sh:Literal;
+  	sh:path dct:issued;
         sh:severity sh:Violation
     ], [
-  	sh:path dct:temporal;
   	sh:nodeKind sh:BlankNodeOrIRI;
+  	sh:path dct:temporal;
+        sh:severity sh:Violation
+    ], [
+  	sh:minCount 1;
+  	sh:nodeKind sh:Literal;
+  	sh:path dct:title;
         sh:severity sh:Violation
-	 ] ;
+    ] ;
     sh:targetClass dcat:DatasetSeries .	
diff --git a/releases/3.0.0-draft/index.html b/releases/3.0.0-draft/index.html
index 680bf46..c591fd2 100644
--- a/releases/3.0.0-draft/index.html
+++ b/releases/3.0.0-draft/index.html
@@ -3100,7 +3100,7 @@ <h3 id="DataService">
                                     
                                 </td>
                                 <td>
-                                    1
+                                    0..*
                                 </td>
                                 <td property="rdfs:comment">
                                     A page or document about this Data Service
@@ -4406,7 +4406,7 @@ <h3 id="Dataset">
                                     
                                 </td>
                                 <td>
-                                    
+                                    0..*
                                 </td>
                                 <td property="rdfs:comment">
                                     A dataset series of which the dataset is part.
@@ -5471,7 +5471,7 @@ <h3 id="Dataset">
                                     
                                 </td>
                                 <td>
-                                    0..*
+                                    0..1
                                 </td>
                                 <td property="rdfs:comment">
                                     The version indicator (name or identifier) of a resource.
diff --git a/releases/3.0.0-draft/shacl/dcat-ap-SHACL.jsonld b/releases/3.0.0-draft/shacl/dcat-ap-SHACL.jsonld
index 18cfd39..69c1718 100644
--- a/releases/3.0.0-draft/shacl/dcat-ap-SHACL.jsonld
+++ b/releases/3.0.0-draft/shacl/dcat-ap-SHACL.jsonld
@@ -1123,18 +1123,6 @@
           },
           "sh:path": "http://www.w3.org/ns/dcat#endpointURL"
         },
-        {
-          "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/8521ebd386ec388c4cf09933c419e3fe7668f29d",
-          "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.documentation",
-          "sh:description": {
-            "en": "A page or document about this Data Service"
-          },
-          "sh:minCount": "1",
-          "sh:name": {
-            "en": "documentation"
-          },
-          "sh:path": "http://xmlns.com/foaf/0.1/page"
-        },
         {
           "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/9eaae476a881de13b9430537ace6e70da7327dbd",
           "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.licence",
@@ -1159,18 +1147,6 @@
           },
           "sh:path": "http://purl.org/dc/terms/publisher"
         },
-        {
-          "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/b86dee5bb20a5e396c2d60cbc5b660f4cadb2f05",
-          "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.documentation",
-          "sh:description": {
-            "en": "A page or document about this Data Service"
-          },
-          "sh:maxCount": "1",
-          "sh:name": {
-            "en": "documentation"
-          },
-          "sh:path": "http://xmlns.com/foaf/0.1/page"
-        },
         {
           "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/dbcf2adef675735c48b532392359af27af5e8b71",
           "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.licence",
@@ -1299,6 +1275,18 @@
           },
           "sh:path": "http://purl.org/dc/terms/provenance"
         },
+        {
+          "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/1e2ff89f72ca069b1668489d90cb44ba553353d5",
+          "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#Dataset.version",
+          "sh:description": {
+            "en": "The version indicator (name or identifier) of a resource."
+          },
+          "sh:maxCount": "1",
+          "sh:name": {
+            "en": "version"
+          },
+          "sh:path": "http://www.w3.org/ns/dcat#version"
+        },
         {
           "@id": "https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/29ba27566ab1f32c8bb73f3492436d4bd868d3d2",
           "rdfs:seeAlso": "https://semiceu.github.io/DCAT-AP/releases/3.0.0#Dataset.language",
diff --git a/releases/3.0.0-draft/shacl/dcat-ap-SHACL.ttl b/releases/3.0.0-draft/shacl/dcat-ap-SHACL.ttl
index 18c8603..d443ee6 100644
--- a/releases/3.0.0-draft/shacl/dcat-ap-SHACL.ttl
+++ b/releases/3.0.0-draft/shacl/dcat-ap-SHACL.ttl
@@ -360,10 +360,8 @@
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/7a20e2eb5f5549088fd53fa93fab0958019f267e>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/7b6713c1f4a52e964f5db57eabef294b6d04e90e>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/83ad7325cc6681e43e44550c269847065a95a14f>,
-    <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/8521ebd386ec388c4cf09933c419e3fe7668f29d>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/9eaae476a881de13b9430537ace6e70da7327dbd>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/b3ec0655204c62a2531244aaeab12f1a2c5e5b5d>,
-    <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/b86dee5bb20a5e396c2d60cbc5b660f4cadb2f05>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/dbcf2adef675735c48b532392359af27af5e8b71>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/dc08f4dca4377fade57f89454e3fa06a8389d314>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/dede6a68a95ac0f43ca88def472d8fc001f86ebe>,
@@ -427,12 +425,6 @@
   shacl:name "endpoint URL"@en;
   shacl:path dcat:endpointURL .
 
-<https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/8521ebd386ec388c4cf09933c419e3fe7668f29d> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.documentation";
-  shacl:description "A page or document about this Data Service"@en;
-  shacl:minCount 1;
-  shacl:name "documentation"@en;
-  shacl:path foaf:page .
-
 <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/9eaae476a881de13b9430537ace6e70da7327dbd> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.licence";
   shacl:description "A licence under which the Data service is made available."@en;
   shacl:maxCount 1;
@@ -445,12 +437,6 @@
   shacl:name "publisher"@en;
   shacl:path dc:publisher .
 
-<https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/b86dee5bb20a5e396c2d60cbc5b660f4cadb2f05> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.documentation";
-  shacl:description "A page or document about this Data Service"@en;
-  shacl:maxCount 1;
-  shacl:name "documentation"@en;
-  shacl:path foaf:page .
-
 <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DataServiceShape/dbcf2adef675735c48b532392359af27af5e8b71> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#DataService.licence";
   shacl:class dc:LicenseDocument;
   shacl:description "A licence under which the Data service is made available."@en;
@@ -586,6 +572,7 @@
   shacl:property <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/00a99d55cbc03165373a8348d5a88402ea4f239a>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/04d197dc40f01e87093bdd0446a9fdb1a9d44319>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/0bcb30d1f00a2e13ee04c77dbcb8018f2ef83d5b>,
+    <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/1e2ff89f72ca069b1668489d90cb44ba553353d5>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/29ba27566ab1f32c8bb73f3492436d4bd868d3d2>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/2ab9813b47309d4af98fdfe34189ea24baecc8cd>,
     <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/2d388ed1a94fa93a83fb179a4ecb339b2566b790>,
@@ -638,6 +625,12 @@
   shacl:name "provenance"@en;
   shacl:path dc:provenance .
 
+<https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/1e2ff89f72ca069b1668489d90cb44ba553353d5> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#Dataset.version";
+  shacl:description "The version indicator (name or identifier) of a resource."@en;
+  shacl:maxCount 1;
+  shacl:name "version"@en;
+  shacl:path dcat:version .
+
 <https://semiceu.github.io/DCAT-AP/releases/3.0.0/shacl/dcat-ap-SHACL.ttl#dcat:DatasetShape/29ba27566ab1f32c8bb73f3492436d4bd868d3d2> rdfs:seeAlso "https://semiceu.github.io/DCAT-AP/releases/3.0.0#Dataset.language";
   shacl:class dc:LinguisticSystem;
   shacl:description "A language of the Dataset."@en;