diff --git a/shapes/Catalog-shape.ttl b/shapes/Catalog-shape.ttl
index 74a53f80b..c2d6cca21 100644
--- a/shapes/Catalog-shape.ttl
+++ b/shapes/Catalog-shape.ttl
@@ -11,6 +11,5 @@
     sh:path dcat:themeTaxonomy ;
     sh:nodeKind sh:IRI ;
     dash:editor dash:URIEditor ;
-    dash:viewer dash:LabelViewer ;
   ]
   .
diff --git a/shapes/Dataset-shape.ttl b/shapes/Dataset-shape.ttl
index 12a0d4560..3bcf3a108 100644
--- a/shapes/Dataset-shape.ttl
+++ b/shapes/Dataset-shape.ttl
@@ -25,9 +25,13 @@
     sh:name "Storage URL" ;
     sh:description "A URL of a service in which the data and metadata of dataset are stored." ;
     sh:path ocmv:storageUrl ;
+    sh:or (
+      [ sh:datatype xsd:anyURI ; ]
+      [ sh:nodeKind sh:Literal ; ]
+    ) ;
     sh:pattern "^https?://" ;
-    dash:editor dash:URIEditor ;
-    dash:viewer dash:URIViewer ;
+    dash:editor dash:TextFieldEditor ;
+    dash:viewer dash:LiteralViewer ;
   ],
   [
     sh:name "Contact Points" ;
diff --git a/shapes/Distribution-shape.ttl b/shapes/Distribution-shape.ttl
index 92840108a..744fea65a 100644
--- a/shapes/Distribution-shape.ttl
+++ b/shapes/Distribution-shape.ttl
@@ -14,9 +14,9 @@
     sh:path ocmv:isComplete ;
     sh:minCount 1 ;
     sh:maxCount 1 ;
-    sh:in ( "true"^^xsd:boolean "false"^^xsd:boolean ) ;
-    dash:editor dash:EnumSelectEditor ;
-    dash:viewer dash:LiteralViewer ;
+    sh:datatype xsd:boolean ;
+    # dash:editor dash:BooleanSelectEditor ;
+    # dash:viewer dash:LiteralViewer ;
   ] ,
   [
     sh:name "Download URL" ;
diff --git a/shapes/Resource-shape.ttl b/shapes/Resource-shape.ttl
index fb2fef4a1..dc814db12 100644
--- a/shapes/Resource-shape.ttl
+++ b/shapes/Resource-shape.ttl
@@ -5,6 +5,7 @@
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 @prefix skos: <http://www.w3.org/2004/02/skos/core#> .
+@prefix fdpo: <https://w3id.org/fdp/fdp-o#> .
 
 <https://w3id.org/ontouml-models/shape/Resource> a sh:NodeShape ;
   sh:targetClass dcat:Resource ;
@@ -67,6 +68,30 @@
     dash:editor dash:URIEditor ;
     dash:viewer dash:LabelViewer ;
   ],
+  [
+    sh:name "Metadata Modified" ;
+    sh:description "Date on which the resource's metadata was changed.";
+    sh:path fdpo:metadataModified ;
+    sh:or (
+      [ sh:datatype xsd:dateTime ; ]
+      [ sh:datatype xsd:date ; ]
+      [ sh:datatype xsd:gYearMonth ; ]
+      [ sh:datatype xsd:gYear ; ]
+    ) ;
+    dash:viewer dash:LiteralViewer ;
+  ],
+  [
+    sh:name "Metadata Issued" ;
+    sh:description "Date of formal issuance of the resource's metadata.";
+    sh:path fdpo:metadataIssued ;
+    sh:or (
+      [ sh:datatype xsd:dateTime ; ]
+      [ sh:datatype xsd:date ; ]
+      [ sh:datatype xsd:gYearMonth ; ]
+      [ sh:datatype xsd:gYear ; ]
+    ) ;
+    dash:viewer dash:LiteralViewer ;
+  ],
   [
     sh:name "Modified" ;
     sh:description "Date on which the resource was changed.";
diff --git a/shapes/SemanticArtefact-shape.ttl b/shapes/SemanticArtefact-shape.ttl
index b6d2fa37f..2008f1bef 100644
--- a/shapes/SemanticArtefact-shape.ttl
+++ b/shapes/SemanticArtefact-shape.ttl
@@ -75,7 +75,6 @@
     sh:description "The type of the model according to how general it is. Allowed values: ocmv:Core for core ontologies, ocmv:Domain for domain ontologies, and ocmv:Application for application ontologies." ;
     sh:path ocmv:ontologyType ;
     sh:nodeKind sh:IRI ;
-    sh:minCount 1 ;
     sh:maxCount 3 ;
     sh:in ( 
       ocmv:Domain