diff --git a/drafts/latest/appendices/inspire-and-iso-19115-mappings.html b/drafts/latest/appendices/inspire-and-iso-19115-mappings.html
index 7c0dac6..14cc9e3 100644
--- a/drafts/latest/appendices/inspire-and-iso-19115-mappings.html
+++ b/drafts/latest/appendices/inspire-and-iso-19115-mappings.html
@@ -2083,7 +2083,7 @@ <h2>Coupled resource - *not in ISO 19115 core</h2>
 <pre>[] a dcat:DataService ;
   dct:type &lt;http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service&gt; ,
     &lt;http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view&gt; ;
-  dcat:servesDataset [
+  dcat:servesDataset [ a dcat:Dataset ;
     dct:identifier &quot;1234567890&quot;^^xsd:string
   ] .</pre>
 
@@ -2144,7 +2144,8 @@ <h2>Resource language and metadata language - *Dataset language and Metadata lan
   &lt;http://publications.europa.eu/resource/authority/language/DEU&gt; ;
   foaf:isPrimaryTopicOf
 # Metadata on metadata
-    [ dct:language
+    [ a dcat:CatalogRecord ;
+      dct:language
       &lt;http://publications.europa.eu/resource/authority/language/NLD&gt; ] .</pre>
 
 <p>Resource metadata in ISO 19139</p>
@@ -2322,7 +2323,7 @@ <h3>Keyword in services</h3>
     [ a skos:Concept ;
       skos:prefLabel &quot;coniferous forest&quot;@en ;
       skos:inScheme [ a skos:ConceptScheme ;
-        rdfs:label &quot;GEMET - Concepts, version 2.4&quot;@en ;
+        dct:title &quot;GEMET - Concepts, version 2.4&quot;@en ;
         dct:issued &quot;2010-01-13&quot;^^xsd:date ] ] ;
 ### Topic categories
   dct:subject &lt;http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/geoscientificInformation&gt; .
@@ -2338,8 +2339,8 @@ <h3>Keyword in services</h3>
     [ a skos:Concept ;
     skos:prefLabel &quot;Floods&quot;@en ;
     skos:inScheme [ a skos:ConceptScheme ;
-    rdfs:label &quot;GEOSS - Societal Benefit Areas, version 1.0&quot;@en ;
-    dct:issued &quot;2010-08-25&quot;^^xsd:date ] ] .</pre>
+      dct:title &quot;GEOSS - Societal Benefit Areas, version 1.0&quot;@en ;
+      dct:issued &quot;2010-08-25&quot;^^xsd:date ] ] .</pre>
 
 <p>Resource metadata in ISO 19139:</p>
 
@@ -2651,10 +2652,10 @@ <h2>Geographic identifier</h2>
 
 # If no URI is used for the geographic identifier
 []
-  dct:spatial [
+  dct:spatial [ a dct:Location , skos:Concept ;
     skos:preflabel &quot;Netherlands&quot;@en;
     skos:prefLabel &quot;Nederland&quot;@nl;
-    skos:inScheme [
+    skos:inScheme [ skos:ConceptScheme ;
       dct:title &quot;Countries Authority Table&quot;@en;
       dct:modified &quot;2009-01-01&quot;^^xsd:date
     ]
@@ -2712,7 +2713,8 @@ <h2>Temporal reference and metadata date –*Additional extent information for t
   foaf:isPrimaryTopicOf
 # Metadata on metadata
 ## Metadata date
-    [ dct:modified &quot;2012-08-13&quot;^^xsd:date ] .</pre>
+    [ a dcat:CatalogRecord ;
+      dct:modified &quot;2012-08-13&quot;^^xsd:date ] .</pre>
 
 <p>Resource metadata in ISO 19139:</p>
 
@@ -2953,19 +2955,18 @@ <h2>Conformity and data quality - *not in ISO 19115 core</h2>
 prov:wasUsedBy [
   a prov:Activity;
 # Conformity degree
-  prov:generated [
+  prov:generated [ a prov:Entity ;
     dct:type &lt;http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/conformant&gt; ;
     dct:description “See the referenced specification”@en
-    prov:qualifiedAssociation [
-      prov:hadPlan [
-      a prov:Plan;
-      prov:wasDerivedFrom [
+    prov:qualifiedAssociation [ a prov:Association ;
+      prov:hadPlan [ a prov:Plan;
+        prov:wasDerivedFrom [
 # Specification
-        a prov:Entity, dct:Standard;
-        dct:title &quot;COMMISSION REGULATION (EC) No 976/2009 of 19 October 2009
-        implementing Directive 2007/2/EC of the European Parliament and of the Council
-        as regards the Network Services&quot;@en
-        dct:issued &quot;2009-10-20&quot;^^xsd:date
+          a prov:Entity , dct:Standard ;
+          dct:title &quot;COMMISSION REGULATION (EC) No 976/2009 of 19 October 2009
+          implementing Directive 2007/2/EC of the European Parliament and of the Council
+          as regards the Network Services&quot;@en
+          dct:issued &quot;2009-10-20&quot;^^xsd:date
       ]
     ];
   ];
@@ -3485,6 +3486,7 @@ <h2>*Metadata standard name, *Metadata standard version</h2>
 
 &lt;https://joinup.ec.europa.eu/release/geodcat-ap/10&gt;
 # Standard name and version of the GeoDCAT-AP record
+  a dct:Standard ;
   dct:title &quot;GeoDCAT-AP&quot;@en ;
   owl:versionInfo &quot;1.0&quot; ;
 .</pre>
@@ -3511,10 +3513,9 @@ <h2>*Metadata standard name, *Metadata standard version</h2>
 
 <pre>[] a dcat:CatalogRecord ;
   dct:conformsTo &lt;https://joinup.ec.europa.eu/release/geodcat-ap/10&gt; ;
-  dct:source [
+  dct:source [ a dcat:CatalogRecord ; 
 # Standard name and version of the source ISO 19115 record
-    a dcat:CatalogRecord ;
-    dct:conformsTo [
+    dct:conformsTo [ a dct:Standard ;
       dct:title &quot;ISO 19115&quot;@en ;
       owl:versionInfo &quot;Nederlands metadata profiel op ISO 19115 voor geografie 1.3&quot;.
     ] ] ;
@@ -3617,6 +3618,7 @@ <h2>Coordinate reference systems and Temporal reference systems – *Reference S
   dct:conformsTo &lt;http://www.opengis.net/def/crs/EPSG/0/4258&gt; .
 
 &lt;http://www.opengis.net/def/crs/EPSG/0/4258&gt;
+  a dct:Standard ;
   dct:type &lt;http://inspire.ec.europa.eu/glossary/SpatialReferenceSystem&gt; .</pre>
 
 <p>Resource metadata in ISO 19139:</p>
@@ -3645,7 +3647,7 @@ <h2>Coordinate reference systems and Temporal reference systems – *Reference S
 <p>Resource metadata in GeoDCAT-AP:</p>
 
 <pre>[] a dcat:Dataset ;
-  dct:conformsTo [
+  dct:conformsTo [ a dct:Standard ;
     dct:identifer &quot;EPSG:4258&quot;^^xsd:string ;
     dct:type &lt;http://inspire.ec.europa.eu/glossary/SpatialReferenceSystem&gt; .
   ] .</pre>
@@ -3931,7 +3933,7 @@ <h2>Encoding - *Distribution format</h2>
 
 <pre>[] a dcat:Dataset ;
   dcat:distribution [ a dcat:Distribution ;
-    dcat:mediaType &lt;http://publications.europa.eu/resource/authority/file-type/TIFF&gt; ] .</pre>
+    dct:format &lt;http://publications.europa.eu/resource/authority/file-type/TIFF&gt; ] .</pre>
 
 <p>Resource metadata in ISO 19139:</p>
 
diff --git a/drafts/latest/examples/activity.jsonld b/drafts/latest/examples/activity.jsonld
index 4181a05..1ceb073 100644
--- a/drafts/latest/examples/activity.jsonld
+++ b/drafts/latest/examples/activity.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6",
+    "@id": "_:N6a64c1b02b694581bb2388823133b623",
     "@type": [
       "http://www.w3.org/ns/prov#Entity"
     ],
@@ -19,40 +19,18 @@
     ]
     },
     {
-    "@id": "_:N385fea47c4c8463b965a249e511a8de6",
-    "@type": [
-      "http://www.w3.org/ns/prov#Plan"
-    ],
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
-      {
-      "@id": "http://data.europa.eu/eli/reg/2010/1089"
-      }
-    ]
-    },
-    {
-    "@id": "_:N297540213321443a84f90245195b6267",
-    "@type": [
-      "http://www.w3.org/ns/prov#Association"
-    ],
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:N385fea47c4c8463b965a249e511a8de6"
-      }
-    ]
-    },
-    {
-    "@id": "_:Nb86a88d0e2474b82b3c5658366964eec",
+    "@id": "_:Nc58a33cab50b4cb8afa95f125014dc9e",
     "@type": [
       "http://www.w3.org/ns/prov#Activity"
     ],
     "http://www.w3.org/ns/prov#generated": [
       {
-      "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6"
+      "@id": "_:N6a64c1b02b694581bb2388823133b623"
       }
     ],
     "http://www.w3.org/ns/prov#qualifiedAssociation": [
       {
-      "@id": "_:N297540213321443a84f90245195b6267"
+      "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246"
       }
     ],
     "http://www.w3.org/ns/prov#used": [
@@ -64,8 +42,8 @@
     {
     "@id": "http://data.europa.eu/eli/reg/2010/1089",
     "@type": [
-      "http://www.w3.org/ns/prov#Entity",
-      "http://purl.org/dc/terms/Standard"
+      "http://purl.org/dc/terms/Standard",
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/issued": [
       {
@@ -79,8 +57,30 @@
       "@value": "\n    Commission Regulation (EU) No 1089/2010 of 23 November 2010 \n    implementing Directive 2007/2/EC of the European Parliament \n    and of the Council as regards interoperability of spatial \n    data sets and services\n  "
       }
     ]
+    },
+    {
+    "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+      {
+      "@id": "http://data.europa.eu/eli/reg/2010/1089"
+      }
+    ]
+    },
+    {
+    "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
+      {
+      "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/activity.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/activity.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/address-agent.jsonld b/drafts/latest/examples/address-agent.jsonld
index 147a640..b2c678d 100644
--- a/drafts/latest/examples/address-agent.jsonld
+++ b/drafts/latest/examples/address-agent.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N3c54b3221f154c3ca637b0b0a97cc03a",
+    "@id": "_:N2a509977f6fb4515aad82b0dde964b85",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/address-kind.jsonld b/drafts/latest/examples/address-kind.jsonld
index e53f800..af7c693 100644
--- a/drafts/latest/examples/address-kind.jsonld
+++ b/drafts/latest/examples/address-kind.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Na92f508d0e02482b8306828aff9a8c85",
+    "@id": "_:N214677b369e94b09a81af610a14cb4a3",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/agent.jsonld b/drafts/latest/examples/agent.jsonld
index 0997646..2254b2b 100644
--- a/drafts/latest/examples/agent.jsonld
+++ b/drafts/latest/examples/agent.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N71ccd39ed6784efbbba9a609ac80fcdc",
+    "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
+      "http://www.w3.org/ns/locn#Address"
     ],
-    "http://www.w3.org/ns/locn#address": [
+    "http://www.w3.org/ns/locn#adminUnitL1": [
       {
-      "@id": "_:N47793150fa234b499af358825b8e6e49"
+      "@value": "Denmark"
       }
     ],
-    "http://xmlns.com/foaf/0.1/mbox": [
+    "http://www.w3.org/ns/locn#adminUnitL2": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "K"
       }
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/ns/locn#postCode": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "1050"
       }
     ],
-    "http://xmlns.com/foaf/0.1/phone": [
+    "http://www.w3.org/ns/locn#postName": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/ns/locn#thoroughfare": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N47793150fa234b499af358825b8e6e49",
+    "@id": "_:N4492ff2123b646a982392c9207fc04e8",
     "@type": [
-      "http://www.w3.org/ns/locn#Address"
-    ],
-    "http://www.w3.org/ns/locn#adminUnitL1": [
-      {
-      "@value": "Denmark"
-      }
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
-    "http://www.w3.org/ns/locn#adminUnitL2": [
+    "http://www.w3.org/ns/locn#address": [
       {
-      "@value": "K"
+      "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6"
       }
     ],
-    "http://www.w3.org/ns/locn#postCode": [
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@value": "1050"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/ns/locn#postName": [
+    "http://xmlns.com/foaf/0.1/name": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/ns/locn#thoroughfare": [
+    "http://xmlns.com/foaf/0.1/phone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/attribution.jsonld b/drafts/latest/examples/attribution.jsonld
index 916e63e..b45d412 100644
--- a/drafts/latest/examples/attribution.jsonld
+++ b/drafts/latest/examples/attribution.jsonld
@@ -2,15 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
-    "http://www.w3.org/ns/prov#qualifiedAttribution": [
-      {
-      "@id": "_:N05e7b35aeadf42169d59007f65915fc4"
-      }
-    ]
-    },
-    {
-    "@id": "_:N3061c1ca402b42259f11d1f1264ad268",
+    "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -41,30 +33,22 @@
     ]
     },
     {
-    "@id": "_:N05e7b35aeadf42169d59007f65915fc4",
-    "@type": [
-      "http://www.w3.org/ns/prov#Attribution"
-    ],
-    "http://www.w3.org/ns/dcat#hadRole": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
-      }
-    ],
-    "http://www.w3.org/ns/prov#agent": [
+    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
+    "http://www.w3.org/ns/prov#qualifiedAttribution": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      "@id": "_:Na18b2b216eae4e55838d3b710de72e7e"
       }
     ]
     },
     {
     "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization",
-      "http://www.w3.org/ns/prov#Organization"
+      "http://www.w3.org/ns/prov#Organization",
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
     "http://www.w3.org/ns/locn#address": [
       {
-      "@id": "_:N3061c1ca402b42259f11d1f1264ad268"
+      "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee"
       }
     ],
     "http://xmlns.com/foaf/0.1/mbox": [
@@ -78,8 +62,24 @@
       "@value": "European Environment Agency"
       }
     ]
+    },
+    {
+    "@id": "_:Na18b2b216eae4e55838d3b710de72e7e",
+    "@type": [
+      "http://www.w3.org/ns/prov#Attribution"
+    ],
+    "http://www.w3.org/ns/dcat#hadRole": [
+      {
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
+      }
+    ],
+    "http://www.w3.org/ns/prov#agent": [
+      {
+      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/attribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/attribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/catalogue-record.jsonld b/drafts/latest/examples/catalogue-record.jsonld
index e7ce9f7..92392b2 100644
--- a/drafts/latest/examples/catalogue-record.jsonld
+++ b/drafts/latest/examples/catalogue-record.jsonld
@@ -29,12 +29,12 @@
     ],
     "http://purl.org/dc/terms/source": [
       {
-      "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47"
+      "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N76717cbb555a4c098a558ced6487f3f1"
+      "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e"
       }
     ],
     "http://xmlns.com/foaf/0.1/primaryTopic": [
@@ -44,7 +44,7 @@
     ]
     },
     {
-    "@id": "_:N76717cbb555a4c098a558ced6487f3f1",
+    "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Organization"
     ],
@@ -56,7 +56,7 @@
     ],
     "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1"
+      "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc"
       }
     ],
     "http://www.w3.org/2006/vcard/ns#hasEmail": [
@@ -66,20 +66,41 @@
     ]
     },
     {
-    "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2011/content#characterEncoding": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@value": "UTF-8"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87",
+    "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf",
+    "@type": [
+      "http://purl.org/dc/terms/Standard"
+    ],
     "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
@@ -94,37 +115,22 @@
     ]
     },
     {
-    "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1",
+    "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/dcat#CatalogRecord"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@value": "K"
+      "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2011/content#characterEncoding": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@value": "UTF-8"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/catalogue-record.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/catalogue-record.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/catalogue-record.rdf b/drafts/latest/examples/catalogue-record.rdf
index 028fcf3..e438a54 100644
--- a/drafts/latest/examples/catalogue-record.rdf
+++ b/drafts/latest/examples/catalogue-record.rdf
@@ -22,8 +22,7 @@
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
     <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2020-03-25</dct:modified>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:sdi@eea.europa.eu"/>
         <vcard:hasAddress>
@@ -35,15 +34,19 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb</dct:identifier>
-    <dct:source rdf:parseType="Resource">
-      <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
-      <dct:conformsTo rdf:parseType="Resource">
-        <dct:title xml:lang="en">ISO 19119/19139</dct:title>
-        <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
-      </dct:conformsTo>
+    <dct:source>
+      <dcat:CatalogRecord>
+        <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
+        <dct:conformsTo>
+          <dct:Standard>
+            <dct:title xml:lang="en">ISO 19119/19139</dct:title>
+            <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
+          </dct:Standard>
+        </dct:conformsTo>
+      </dcat:CatalogRecord>
     </dct:source>
   </rdf:Description>
 
diff --git a/drafts/latest/examples/catalogue-record.ttl b/drafts/latest/examples/catalogue-record.ttl
index 6c01370..673a19b 100644
--- a/drafts/latest/examples/catalogue-record.ttl
+++ b/drafts/latest/examples/catalogue-record.ttl
@@ -18,7 +18,9 @@ record:af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb a dcat:CatalogRecord ;
   dct:identifier "af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb"^^xsd:string ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:modified "2020-03-25"^^xsd:date ;
-  dct:source [ dct:conformsTo [ dct:title "ISO 19119/19139"@en ;
+  dct:source [ a dcat:CatalogRecord ;
+      dct:conformsTo [ a dct:Standard ;
+          dct:title "ISO 19119/19139"@en ;
           owl:versionInfo "1.0"@en ] ;
       cnt:characterEncoding "UTF-8"^^xsd:string ] ;
   dcat:contactPoint [ a vcard:Organization ;
diff --git a/drafts/latest/examples/category-scheme.jsonld b/drafts/latest/examples/category-scheme.jsonld
index 31b7157..30b9b36 100644
--- a/drafts/latest/examples/category-scheme.jsonld
+++ b/drafts/latest/examples/category-scheme.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bd1f63866614d1491a18e7f39533145",
+    "@id": "_:Nd87a301c581b4986bc7fd4eab871ba3d",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category-scheme.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category-scheme.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/category.jsonld b/drafts/latest/examples/category.jsonld
index 75e2a5c..cef8e14 100644
--- a/drafts/latest/examples/category.jsonld
+++ b/drafts/latest/examples/category.jsonld
@@ -2,41 +2,41 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb909be1ca823434caa2794d873572a46",
+    "@id": "_:N87ac041d036347db9e91fd6da2c3fbc8",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
-    "http://purl.org/dc/terms/issued": [
+    "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2010-07-06"
+      "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1"
       }
     ],
-    "http://purl.org/dc/terms/title": [
+    "http://www.w3.org/2004/02/skos/core#prefLabel": [
       {
       "@language": "en",
-      "@value": "EEA categories"
+      "@value": "geospatial data"
       }
     ]
     },
     {
-    "@id": "_:N86f9c508ef4a4214a367b2418e8f751b",
+    "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept"
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
-    "http://www.w3.org/2004/02/skos/core#inScheme": [
+    "http://purl.org/dc/terms/issued": [
       {
-      "@id": "_:Nb909be1ca823434caa2794d873572a46"
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2010-07-06"
       }
     ],
-    "http://www.w3.org/2004/02/skos/core#prefLabel": [
+    "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
-      "@value": "geospatial data"
+      "@value": "EEA categories"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/data-service.jsonld b/drafts/latest/examples/data-service.jsonld
index 66196ba..94d7935 100644
--- a/drafts/latest/examples/data-service.jsonld
+++ b/drafts/latest/examples/data-service.jsonld
@@ -2,113 +2,40 @@
   {
   "@graph": [
     {
-    "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
-      }
-    ]
-    },
-    {
-    "@id": "_:N8443a2cfbf8f48af94e3603906bd4628",
-    "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
-    ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "No limitations in the use of this web service."
-      }
-    ]
-    },
-    {
-    "@id": "_:Nd4a9379e223848aa920829f37d0ce429",
+    "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/prov#Plan"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
-      {
-      "@value": "K"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
       }
     ]
     },
     {
-    "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41",
+    "@id": "_:N8f860ccaf3e3439e989e19924d14befc",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
-    ],
-    "http://xmlns.com/foaf/0.1/mbox": [
-      {
-      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
       "@language": "en",
-      "@value": "Tracasa"
+      "@value": "European Environment Agency"
       }
-    ]
-    },
-    {
-    "@id": "_:N3c7fa1a1161647e097f1518721be8b38",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N538447af99804281b76f4085d9868399"
+      "@id": "_:N0840f1ab5fb04ef1b613eade764f080e"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
-      {
-      "@id": "_:N1684d0298ed24d9a817c684031e999d8"
-      }
-    ]
-    },
-    {
-    "@id": "_:N1684d0298ed24d9a817c684031e999d8",
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96"
-      }
-    ]
-    },
-    {
-    "@id": "_:N538447af99804281b76f4085d9868399",
-    "http://purl.org/dc/terms/description": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "mailto:info@eea.europa.eu"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "http://www.eea.europa.eu"
       }
     ]
     },
@@ -124,7 +51,7 @@
     ],
     "http://data.europa.eu/930/processor": [
       {
-      "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41"
+      "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c"
       }
     ],
     "http://purl.org/dc/terms/accessRights": [
@@ -134,19 +61,19 @@
     ],
     "http://purl.org/dc/terms/conformsTo": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
       },
       {
       "@id": "http://www.opengis.net/def/crs/EPSG/0/3857"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
       }
     ],
     "http://purl.org/dc/terms/description": [
@@ -168,12 +95,12 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N8443a2cfbf8f48af94e3603906bd4628"
+      "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b"
+      "@id": "_:N8b13e29737e34d09ad6635286a74c692"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -184,15 +111,15 @@
     ],
     "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09"
+      "@id": "_:N8f860ccaf3e3439e989e19924d14befc"
       }
     ],
     "http://www.w3.org/ns/dcat#endpointDescription": [
@@ -214,7 +141,7 @@
     "http://www.w3.org/ns/dcat#keyword": [
       {
       "@language": "en",
-      "@value": "Water Information System for Europe"
+      "@value": "Groundwater body"
       },
       {
       "@language": "en",
@@ -222,7 +149,7 @@
       },
       {
       "@language": "en",
-      "@value": "Groundwater body"
+      "@value": "Water Information System for Europe"
       },
       {
       "@language": "en",
@@ -236,24 +163,24 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://inspire.ec.europa.eu/theme/ef"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
+      "@id": "http://inspire.ec.europa.eu/theme/ef"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
       },
       {
       "@id": "http://www.eionet.europa.eu/gemet/concept/5352"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:N3c7fa1a1161647e097f1518721be8b38"
+      "@id": "_:N4bab8d10f72249f196bc4011acc751fb"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -263,41 +190,126 @@
     ]
     },
     {
-    "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96",
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+    "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c",
+    "@type": [
+      "http://xmlns.com/foaf/0.1/Organization"
+    ],
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
+      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
+      }
+    ],
+    "http://xmlns.com/foaf/0.1/name": [
+      {
+      "@language": "en",
+      "@value": "Tracasa"
       }
     ]
     },
     {
-    "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09",
+    "@id": "_:N4bab8d10f72249f196bc4011acc751fb",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/ns/prov#generated": [
+      {
+      "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ncfff83d157fa4a4e9f687d0850091880"
+      }
+    ]
+    },
+    {
+    "@id": "_:N0840f1ab5fb04ef1b613eade764f080e",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
+      {
+      "@value": "Denmark"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#locality": [
+      {
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
+      }
+    ]
+    },
+    {
+    "@id": "_:N8b13e29737e34d09ad6635286a74c692",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "No limitations in the use of this web service."
       }
+    ]
+    },
+    {
+    "@id": "_:Ncfff83d157fa4a4e9f687d0850091880",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@id": "_:Nd4a9379e223848aa920829f37d0ce429"
+      "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b"
       }
+    ]
+    },
+    {
+    "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf",
+    "@type": [
+      "http://www.w3.org/ns/prov#Entity"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@id": "mailto:info@eea.europa.eu"
+      "@language": "en",
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://www.eea.europa.eu"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/data-service.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/data-service.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/data-service.rdf b/drafts/latest/examples/data-service.rdf
index 19665d0..001dc24 100644
--- a/drafts/latest/examples/data-service.rdf
+++ b/drafts/latest/examples/data-service.rdf
@@ -38,9 +38,11 @@
     <dct:identifier>eea_v_4326_250_k_wise-eionet-monitoring-sites_service</dct:identifier>
     <dcat:servesDataset rdf:resource="https://some.catalogue/resource/eea_v_4326_250_k_wise-eionet_p_2001-2020_v01_r04"/>
     <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2018-09-15</dct:issued>
     <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
@@ -56,14 +58,20 @@
     </dct:license>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
diff --git a/drafts/latest/examples/data-service.ttl b/drafts/latest/examples/data-service.ttl
index f416156..4423863 100644
--- a/drafts/latest/examples/data-service.ttl
+++ b/drafts/latest/examples/data-service.ttl
@@ -35,7 +35,8 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
   dct:issued "2018-09-15"^^xsd:date ;
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "No limitations in the use of this web service."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"^^gsp:wktLiteral ] ;
   dct:title "EIONET monitoring sites - Web Service"@en ;
   dct:type <http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service>,
@@ -65,8 +66,11 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
     <http://www.eionet.europa.eu/gemet/concept/5352>,
     <http://www.eionet.europa.eu/gemet/concept/8229> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
   foaf:isPrimaryTopicOf <https://some.catalogue/record/29e08b66-e6f6-4b4f-95ad-b582d9fe3df5> .
 
diff --git a/drafts/latest/examples/dataset.jsonld b/drafts/latest/examples/dataset.jsonld
index 0ad7f9e..5347c80 100644
--- a/drafts/latest/examples/dataset.jsonld
+++ b/drafts/latest/examples/dataset.jsonld
@@ -2,7 +2,53 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59",
+    "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Organization"
+    ],
+    "http://www.w3.org/2006/vcard/ns#fn": [
+      {
+      "@language": "en",
+      "@value": "European Environment Agency"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+      {
+      "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+      {
+      "@id": "mailto:info@eea.europa.eu"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
+      {
+      "@id": "http://www.eea.europa.eu"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nc37713e3651a4584ba26842bbaaffac3",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
     "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
       "@id": "http://data.europa.eu/eli/reg/2010/1089"
@@ -53,28 +99,28 @@
     ],
     "http://purl.org/dc/terms/provenance": [
       {
-      "@id": "_:N353ea95227a845878efab4fda323b6ca"
+      "@id": "_:N4c7e51874d2241e491db292700082270"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:N6e6b81660d34443d8458df13dafbfdf2"
+      "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f"
       }
     ],
     "http://purl.org/dc/terms/subject": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
       }
     ],
     "http://purl.org/dc/terms/temporal": [
       {
-      "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe"
+      "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -90,12 +136,12 @@
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N81ec0f86630e4137b485eb58b7b4899b"
+      "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80"
       }
     ],
     "http://www.w3.org/ns/dcat#distribution": [
       {
-      "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc"
+      "@id": "_:Ne79a28d361cc4548a6095efa5890e41e"
       }
     ],
     "http://www.w3.org/ns/dcat#keyword": [
@@ -105,19 +151,19 @@
       },
       {
       "@language": "en",
-      "@value": "Noise map"
+      "@value": "agglomerations"
       },
       {
       "@language": "en",
-      "@value": "noise contour"
+      "@value": "Noise map"
       },
       {
       "@language": "en",
-      "@value": "Environmental Noise Directive"
+      "@value": "noise contour"
       },
       {
       "@language": "en",
-      "@value": "agglomerations"
+      "@value": "Environmental Noise Directive"
       }
     ],
     "http://www.w3.org/ns/dcat#spatialResolutionInMeters": [
@@ -128,18 +174,18 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
+      "@id": "http://inspire.ec.europa.eu/theme/hh"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
+      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/theme/hh"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:Nc146e31a488842fab5b3c97b93bdef51"
+      "@id": "_:N048a94230f534891a2585ac6332f9cba"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -154,114 +200,99 @@
     ]
     },
     {
-    "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointDescription": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointURL": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
+      "@value": "1050"
       }
-    ]
-    },
-    {
-    "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe",
-    "http://www.w3.org/ns/prov#hadPlan": [
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8",
-    "http://purl.org/dc/terms/description": [
+    "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a",
+    "@type": [
+      "http://www.w3.org/ns/dcat#DataService"
+    ],
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/ns/dcat#endpointDescription": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      }
+    ],
+    "http://www.w3.org/ns/dcat#endpointURL": [
+      {
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
       }
     ]
     },
     {
-    "@id": "_:N6e6b81660d34443d8458df13dafbfdf2",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
-      },
+    "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      "@id": "_:Nc37713e3651a4584ba26842bbaaffac3"
       }
     ]
     },
     {
-    "@id": "_:N447fdc84767e4600b3976599c7b3de91",
+    "@id": "_:N4c7e51874d2241e491db292700082270",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://purl.org/dc/terms/ProvenanceStatement"
     ],
     "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
       }
     ]
     },
     {
-    "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc",
+    "@id": "_:N85b46c116bf14fa9b76080caa17f2169",
     "@type": [
-      "http://www.w3.org/ns/dcat#Distribution"
-    ],
-    "http://purl.org/dc/terms/accessRights": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
-      }
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/description": [
       {
       "@language": "en",
-      "@value": "NoiseContours_air_lnight"
-      }
-    ],
-    "http://purl.org/dc/terms/format": [
-      {
-      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
-      }
-    ],
-    "http://purl.org/dc/terms/license": [
-      {
-      "@id": "_:N447fdc84767e4600b3976599c7b3de91"
-      }
-    ],
-    "http://www.w3.org/ns/adms#representationTechnique": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
-      }
-    ],
-    "http://www.w3.org/ns/dcat#accessService": [
-      {
-      "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260"
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/ns/dcat#accessURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     },
     {
-    "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe",
+    "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -279,92 +310,76 @@
     ]
     },
     {
-    "@id": "_:N353ea95227a845878efab4fda323b6ca",
+    "@id": "_:N048a94230f534891a2585ac6332f9cba",
     "@type": [
-      "http://purl.org/dc/terms/ProvenanceStatement"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
+    "http://www.w3.org/ns/prov#generated": [
       {
-      "@language": "en",
-      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
+      "@id": "_:N85b46c116bf14fa9b76080caa17f2169"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea"
       }
     ]
     },
     {
-    "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c",
+    "@id": "_:Ne79a28d361cc4548a6095efa5890e41e",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
+      "http://www.w3.org/ns/dcat#Distribution"
     ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
+    "http://purl.org/dc/terms/accessRights": [
       {
-      "@value": "Denmark"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "NoiseContours_air_lnight"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://purl.org/dc/terms/format": [
       {
-      "@value": "1050"
+      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/license": [
       {
-      "@value": "K"
+      "@id": "_:N611e92150c174750b4f33f9b66659314"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/adms#representationTechnique": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
       }
-    ]
-    },
-    {
-    "@id": "_:Nc146e31a488842fab5b3c97b93bdef51",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8"
+      "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+    "http://www.w3.org/ns/dcat#accessURL": [
       {
-      "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
       }
     ]
     },
     {
-    "@id": "_:N81ec0f86630e4137b485eb58b7b4899b",
+    "@id": "_:N611e92150c174750b4f33f9b66659314",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://purl.org/dc/terms/LicenseDocument"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
-      {
-      "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
-      {
-      "@id": "mailto:info@eea.europa.eu"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
-      {
-      "@id": "http://www.eea.europa.eu"
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/dataset.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/dataset.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/dataset.rdf b/drafts/latest/examples/dataset.rdf
index e4fc9f3..fa91aaa 100644
--- a/drafts/latest/examples/dataset.rdf
+++ b/drafts/latest/examples/dataset.rdf
@@ -42,9 +42,11 @@
     <dcat:theme rdf:resource="http://www.eionet.europa.eu/gemet/concept/2884"/>
     <dct:identifier>eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00</dct:identifier>
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:temporal>
       <dct:PeriodOfTime>
@@ -62,14 +64,20 @@
     <dcat:spatialResolutionInMeters rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">10</dcat:spatialResolutionInMeters>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
@@ -77,10 +85,12 @@
     <dcat:distribution>
       <dcat:Distribution>
         <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-        <dcat:accessService rdf:parseType="Resource">
-          <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-          <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-          <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+        <dcat:accessService>
+          <dcat:DataService>
+            <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+            <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+            <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+          </dcat:DataService>
         </dcat:accessService>
         <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
         <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
@@ -94,8 +104,7 @@
       </dcat:Distribution>
     </dcat:distribution>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:info@eea.europa.eu"/>
         <vcard:hasURL rdf:resource="http://www.eea.europa.eu"/>
@@ -108,7 +117,7 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <geodcat:custodian rdf:resource="http://publications.europa.eu/resource/authority/corporate-body/EEA"/>
   </rdf:Description>
diff --git a/drafts/latest/examples/dataset.ttl b/drafts/latest/examples/dataset.ttl
index a20077e..1a28229 100644
--- a/drafts/latest/examples/dataset.ttl
+++ b/drafts/latest/examples/dataset.ttl
@@ -31,7 +31,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:provenance [ a dct:ProvenanceStatement ;
       rdfs:label "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"^^gsp:wktLiteral ] ;
   dct:subject <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment>,
     <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health>,
@@ -58,7 +59,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
       dct:license [ a dct:LicenseDocument ;
           rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
       adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-      dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+      dcat:accessService [ a dcat:DataService ;
+          dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
           dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
           dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
       dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ] ;
@@ -72,9 +74,12 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
     <http://publications.europa.eu/resource/authority/data-theme/HEAL>,
     <http://www.eionet.europa.eu/gemet/concept/2884> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
   foaf:isPrimaryTopicOf record:e7807ecb-a8e6-4a33-baa2-d119eec9ce24 ;
   foaf:page <https://noise.eea.europa.eu/> .
 
diff --git a/drafts/latest/examples/distribution.jsonld b/drafts/latest/examples/distribution.jsonld
index 3bde226..71d0bb1 100644
--- a/drafts/latest/examples/distribution.jsonld
+++ b/drafts/latest/examples/distribution.jsonld
@@ -2,19 +2,10 @@
   {
   "@graph": [
     {
-    "@id": "_:N394a10b0fe7c4212a8393d7767d8e398",
+    "@id": "_:N8f8fc6421225434f841f1884b184d17d",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://www.w3.org/ns/dcat#DataService"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
-      }
-    ]
-    },
-    {
-    "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b",
     "http://purl.org/dc/terms/conformsTo": [
       {
       "@id": "http://www.opengeospatial.org/standards/wms"
@@ -32,7 +23,19 @@
     ]
     },
     {
-    "@id": "_:N8c69889fd6d8447eb03657fd1039bb8a",
+    "@id": "_:N50e40864e6934766a61ec0fa123745f0",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
+      {
+      "@language": "en",
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      }
+    ]
+    },
+    {
+    "@id": "_:N35b40925d8ab4847912a450a2ff6c17d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
@@ -54,7 +57,7 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N394a10b0fe7c4212a8393d7767d8e398"
+      "@id": "_:N50e40864e6934766a61ec0fa123745f0"
       }
     ],
     "http://www.w3.org/ns/adms#representationTechnique": [
@@ -64,7 +67,7 @@
     ],
     "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b"
+      "@id": "_:N8f8fc6421225434f841f1884b184d17d"
       }
     ],
     "http://www.w3.org/ns/dcat#accessURL": [
@@ -74,6 +77,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/distribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/distribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/distribution.rdf b/drafts/latest/examples/distribution.rdf
index 0cdd298..8c760a0 100644
--- a/drafts/latest/examples/distribution.rdf
+++ b/drafts/latest/examples/distribution.rdf
@@ -10,10 +10,12 @@
 
   <dcat:Distribution>
     <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-    <dcat:accessService rdf:parseType="Resource">
-      <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-      <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-      <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+    <dcat:accessService>
+      <dcat:DataService>
+        <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+        <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+        <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+      </dcat:DataService>
     </dcat:accessService>
     <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
     <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
diff --git a/drafts/latest/examples/distribution.ttl b/drafts/latest/examples/distribution.ttl
index aa8a92b..4deeb12 100644
--- a/drafts/latest/examples/distribution.ttl
+++ b/drafts/latest/examples/distribution.ttl
@@ -13,7 +13,8 @@
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
   adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-  dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+  dcat:accessService [ a dcat:DataService ;
+      dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
       dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
       dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
   dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> .
diff --git a/drafts/latest/examples/document.jsonld b/drafts/latest/examples/document.jsonld
index 5400d09..2bccf75 100644
--- a/drafts/latest/examples/document.jsonld
+++ b/drafts/latest/examples/document.jsonld
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/kind.jsonld b/drafts/latest/examples/kind.jsonld
index b51ab8d..37e64d9 100644
--- a/drafts/latest/examples/kind.jsonld
+++ b/drafts/latest/examples/kind.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N9e60680ef6f7434db5c6be253a288a19",
+    "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/2006/vcard/ns#Address"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "_:N6292c5978a79402789ba1b2bc44c0bde"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "1050"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N6292c5978a79402789ba1b2bc44c0bde",
+    "@id": "_:Nc495f7b503074a87863284d5ec68a368",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@value": "1050"
+      "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@value": "K"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/licence-document.jsonld b/drafts/latest/examples/licence-document.jsonld
index e2be137..f4b8563 100644
--- a/drafts/latest/examples/licence-document.jsonld
+++ b/drafts/latest/examples/licence-document.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N72b16e72625143e0b5da03152b261dd3",
+    "@id": "_:N9a2c7ff3aa6f48b18061700d76a2e78f",
     "@type": [
       "http://purl.org/dc/terms/LicenseDocument"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/licence-document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/licence-document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/location-geom.jsonld b/drafts/latest/examples/location-geom.jsonld
index b5a47d2..5115831 100644
--- a/drafts/latest/examples/location-geom.jsonld
+++ b/drafts/latest/examples/location-geom.jsonld
@@ -2,22 +2,22 @@
   {
   "@graph": [
     {
-    "@id": "_:N759586605ebf41e185198f6810043b6c",
+    "@id": "_:N96e056233dac4daa927a49a5dc94b9e0",
     "@type": [
       "http://purl.org/dc/terms/Location"
     ],
     "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
       {
       "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
       "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-geom.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-geom.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/location-gn.jsonld b/drafts/latest/examples/location-gn.jsonld
index 227c447..89ef57f 100644
--- a/drafts/latest/examples/location-gn.jsonld
+++ b/drafts/latest/examples/location-gn.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb8df6606c3854a5aa4e7369777e03963",
+    "@id": "_:N3b31777483544c1e84ac00447a5f9213",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,10 +20,10 @@
     ]
     },
     {
-    "@id": "_:N3deccf30270a4926b897711acd1b537c",
+    "@id": "_:N2269ddc652564c0aafbeb0607e42ccf4",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept",
-      "http://purl.org/dc/terms/Location"
+      "http://purl.org/dc/terms/Location",
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
     "http://purl.org/dc/terms/identifier": [
       {
@@ -32,7 +32,7 @@
     ],
     "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@id": "_:Nb8df6606c3854a5aa4e7369777e03963"
+      "@id": "_:N3b31777483544c1e84ac00447a5f9213"
       }
     ],
     "http://www.w3.org/2004/02/skos/core#prefLabel": [
@@ -43,6 +43,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-gn.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-gn.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/media-type.jsonld b/drafts/latest/examples/media-type.jsonld
index 01f2a43..24f63c7 100644
--- a/drafts/latest/examples/media-type.jsonld
+++ b/drafts/latest/examples/media-type.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b",
+    "@id": "_:Nf78592ee237d45baaf2b991752201416",
     "@type": [
       "http://purl.org/dc/terms/MediaType"
     ],
@@ -13,17 +13,17 @@
     ]
     },
     {
-    "@id": "_:Na8e226f6c01e4eef901034d70a794229",
+    "@id": "_:N33b9b001ad6a4d5ba5a47d296d4a958d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
     "http://purl.org/dc/terms/format": [
       {
-      "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b"
+      "@id": "_:Nf78592ee237d45baaf2b991752201416"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/media-type.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/media-type.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/metric.jsonld b/drafts/latest/examples/metric.jsonld
index d34640c..4791c86 100644
--- a/drafts/latest/examples/metric.jsonld
+++ b/drafts/latest/examples/metric.jsonld
@@ -90,6 +90,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/metric.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/metric.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/period-of-time-with-owl-time.jsonld b/drafts/latest/examples/period-of-time-with-owl-time.jsonld
index 4a01c50..5af6972 100644
--- a/drafts/latest/examples/period-of-time-with-owl-time.jsonld
+++ b/drafts/latest/examples/period-of-time-with-owl-time.jsonld
@@ -2,40 +2,46 @@
   {
   "@graph": [
     {
-    "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb",
-    "http://www.w3.org/2006/time#inXSDDate": [
-      {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2016-01-01"
-      }
-    ]
-    },
-    {
-    "@id": "_:N5a2d171fa13149ebb763f109f8b9b38e",
+    "@id": "_:N949e1558128e48afb7851376bb7b641e",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
     "http://www.w3.org/2006/time#hasBeginning": [
       {
-      "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb"
+      "@id": "_:N2ce1edd3347a46c7a523119367e2daab"
       }
     ],
     "http://www.w3.org/2006/time#hasEnd": [
       {
-      "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67"
+      "@id": "_:Ndb358e6bb2b64395bff110170569b4e7"
       }
     ]
     },
     {
-    "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67",
+    "@id": "_:Ndb358e6bb2b64395bff110170569b4e7",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
     "http://www.w3.org/2006/time#inXSDDate": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#date",
       "@value": "2016-12-31"
       }
     ]
+    },
+    {
+    "@id": "_:N2ce1edd3347a46c7a523119367e2daab",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
+    "http://www.w3.org/2006/time#inXSDDate": [
+      {
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2016-01-01"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time-with-owl-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time-with-owl-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/period-of-time-with-owl-time.rdf b/drafts/latest/examples/period-of-time-with-owl-time.rdf
index 601d52b..26ebb5f 100644
--- a/drafts/latest/examples/period-of-time-with-owl-time.rdf
+++ b/drafts/latest/examples/period-of-time-with-owl-time.rdf
@@ -7,11 +7,15 @@
 >
 
   <dct:PeriodOfTime>
-    <time:hasBeginning rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+    <time:hasBeginning>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+      </time:Instant>
     </time:hasBeginning>
-    <time:hasEnd rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+    <time:hasEnd>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+      </time:Instant>
     </time:hasEnd>
   </dct:PeriodOfTime>
 
diff --git a/drafts/latest/examples/period-of-time-with-owl-time.ttl b/drafts/latest/examples/period-of-time-with-owl-time.ttl
index d0cd87b..d54ab5e 100644
--- a/drafts/latest/examples/period-of-time-with-owl-time.ttl
+++ b/drafts/latest/examples/period-of-time-with-owl-time.ttl
@@ -6,6 +6,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 [] a dct:PeriodOfTime ;
-  time:hasBeginning [ time:inXSDDate "2016-01-01"^^xsd:date ] ;
-  time:hasEnd [ time:inXSDDate "2016-12-31"^^xsd:date ] .
+  time:hasBeginning [ a time:Instant ;
+      time:inXSDDate "2016-01-01"^^xsd:date ] ;
+  time:hasEnd [ a time:Instant ;
+      time:inXSDDate "2016-12-31"^^xsd:date ] .
 
diff --git a/drafts/latest/examples/period-of-time.jsonld b/drafts/latest/examples/period-of-time.jsonld
index 24888c5..45fab20 100644
--- a/drafts/latest/examples/period-of-time.jsonld
+++ b/drafts/latest/examples/period-of-time.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bc410bb379146a58b2781da610c243c",
+    "@id": "_:N807e64eb96f344eaa5ddbb3912b2d774",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/provenance-statement.jsonld b/drafts/latest/examples/provenance-statement.jsonld
index 80f6548..76a488a 100644
--- a/drafts/latest/examples/provenance-statement.jsonld
+++ b/drafts/latest/examples/provenance-statement.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N8a66edc6ef8a483eb6669b330c98403d",
+    "@id": "_:N40eef4339c2e4f37b62af4808535f4a0",
     "@type": [
       "http://purl.org/dc/terms/ProvenanceStatement"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/provenance-statement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/provenance-statement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/quality-measurement.jsonld b/drafts/latest/examples/quality-measurement.jsonld
index e3742c8..7523545 100644
--- a/drafts/latest/examples/quality-measurement.jsonld
+++ b/drafts/latest/examples/quality-measurement.jsonld
@@ -2,37 +2,24 @@
   {
   "@graph": [
     {
-    "@id": "_:N742cf61b8df54978a84b03fda45df953",
+    "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
-    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
-      {
-      "@id": "http://www.qudt.org/vocab/unit/M"
-      }
-    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "10"
-      }
-    ]
-    },
-    {
-    "@id": "https://some.catalogue/resource/d45678",
-    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
-      {
-      "@id": "_:N742cf61b8df54978a84b03fda45df953"
+      "@value": "0.000001"
       }
     ]
     },
     {
-    "@id": "_:N816080ae92364b909759bec8fca5ce78",
+    "@id": "_:N34bd32b179154448bf83eeb02bead81e",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -54,15 +41,15 @@
     ]
     },
     {
-    "@id": "https://some.catalogue/resource/c34567",
+    "@id": "https://some.catalogue/resource/d45678",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N816080ae92364b909759bec8fca5ce78"
+      "@id": "_:N3785e6c39d704866be6b80622d2161e3"
       }
     ]
     },
     {
-    "@id": "_:N18fada498a4a436fa06fc3ae4489ccba",
+    "@id": "_:N3785e6c39d704866be6b80622d2161e3",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -73,30 +60,43 @@
     ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "100"
+      "@value": "10"
+      }
+    ]
+    },
+    {
+    "@id": "https://some.catalogue/resource/c34567",
+    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
+      {
+      "@id": "_:N34bd32b179154448bf83eeb02bead81e"
       }
     ]
     },
     {
-    "@id": "_:N0bcdac561ae047cb9a2077d808e072fb",
+    "@id": "_:Nfa33069a4a7443318609c69475a60772",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
+    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
+      {
+      "@id": "http://www.qudt.org/vocab/unit/M"
+      }
+    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "0.000001"
+      "@value": "100"
       }
     ]
     },
@@ -104,7 +104,7 @@
     "@id": "https://some.catalogue/resource/a12345",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N0bcdac561ae047cb9a2077d808e072fb"
+      "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799"
       }
     ]
     },
@@ -112,11 +112,11 @@
     "@id": "https://some.catalogue/resource/b23456",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N18fada498a4a436fa06fc3ae4489ccba"
+      "@id": "_:Nfa33069a4a7443318609c69475a60772"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/quality-measurement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/quality-measurement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/standard-crs.jsonld b/drafts/latest/examples/standard-crs.jsonld
index ad0b15a..7607adc 100644
--- a/drafts/latest/examples/standard-crs.jsonld
+++ b/drafts/latest/examples/standard-crs.jsonld
@@ -1,18 +1,6 @@
 [
   {
   "@graph": [
-    {
-    "@id": "http://www.opengis.net/def/crs/OGC",
-    "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
-    ],
-    "http://purl.org/dc/terms/title": [
-      {
-      "@language": "en",
-      "@value": "OGC Coordinate Reference Systems"
-      }
-    ]
-    },
     {
     "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
     "@type": [
@@ -46,8 +34,20 @@
       "@value": "CRS84"
       }
     ]
+    },
+    {
+    "@id": "http://www.opengis.net/def/crs/OGC",
+    "@type": [
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+    ],
+    "http://purl.org/dc/terms/title": [
+      {
+      "@language": "en",
+      "@value": "OGC Coordinate Reference Systems"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-crs.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-crs.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/standard-ir.jsonld b/drafts/latest/examples/standard-ir.jsonld
index cb2bdd1..9e69477 100644
--- a/drafts/latest/examples/standard-ir.jsonld
+++ b/drafts/latest/examples/standard-ir.jsonld
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-ir.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-ir.rdf"
   }
 ]
\ No newline at end of file
diff --git a/drafts/latest/examples/standard-md.jsonld b/drafts/latest/examples/standard-md.jsonld
index 6ff71f1..ec699e0 100644
--- a/drafts/latest/examples/standard-md.jsonld
+++ b/drafts/latest/examples/standard-md.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N18ad7702a4e74d058a2e41063082d15c",
+    "@id": "_:Nfe59b8f29790426c98c9ca3a0a0646c1",
     "@type": [
       "http://purl.org/dc/terms/Standard"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-md.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-md.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/activity.jsonld b/releases/2.0.0/examples/activity.jsonld
index 4181a05..1ceb073 100644
--- a/releases/2.0.0/examples/activity.jsonld
+++ b/releases/2.0.0/examples/activity.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6",
+    "@id": "_:N6a64c1b02b694581bb2388823133b623",
     "@type": [
       "http://www.w3.org/ns/prov#Entity"
     ],
@@ -19,40 +19,18 @@
     ]
     },
     {
-    "@id": "_:N385fea47c4c8463b965a249e511a8de6",
-    "@type": [
-      "http://www.w3.org/ns/prov#Plan"
-    ],
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
-      {
-      "@id": "http://data.europa.eu/eli/reg/2010/1089"
-      }
-    ]
-    },
-    {
-    "@id": "_:N297540213321443a84f90245195b6267",
-    "@type": [
-      "http://www.w3.org/ns/prov#Association"
-    ],
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:N385fea47c4c8463b965a249e511a8de6"
-      }
-    ]
-    },
-    {
-    "@id": "_:Nb86a88d0e2474b82b3c5658366964eec",
+    "@id": "_:Nc58a33cab50b4cb8afa95f125014dc9e",
     "@type": [
       "http://www.w3.org/ns/prov#Activity"
     ],
     "http://www.w3.org/ns/prov#generated": [
       {
-      "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6"
+      "@id": "_:N6a64c1b02b694581bb2388823133b623"
       }
     ],
     "http://www.w3.org/ns/prov#qualifiedAssociation": [
       {
-      "@id": "_:N297540213321443a84f90245195b6267"
+      "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246"
       }
     ],
     "http://www.w3.org/ns/prov#used": [
@@ -64,8 +42,8 @@
     {
     "@id": "http://data.europa.eu/eli/reg/2010/1089",
     "@type": [
-      "http://www.w3.org/ns/prov#Entity",
-      "http://purl.org/dc/terms/Standard"
+      "http://purl.org/dc/terms/Standard",
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/issued": [
       {
@@ -79,8 +57,30 @@
       "@value": "\n    Commission Regulation (EU) No 1089/2010 of 23 November 2010 \n    implementing Directive 2007/2/EC of the European Parliament \n    and of the Council as regards interoperability of spatial \n    data sets and services\n  "
       }
     ]
+    },
+    {
+    "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+      {
+      "@id": "http://data.europa.eu/eli/reg/2010/1089"
+      }
+    ]
+    },
+    {
+    "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
+      {
+      "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/activity.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/activity.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/address-agent.jsonld b/releases/2.0.0/examples/address-agent.jsonld
index 147a640..b2c678d 100644
--- a/releases/2.0.0/examples/address-agent.jsonld
+++ b/releases/2.0.0/examples/address-agent.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N3c54b3221f154c3ca637b0b0a97cc03a",
+    "@id": "_:N2a509977f6fb4515aad82b0dde964b85",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/address-kind.jsonld b/releases/2.0.0/examples/address-kind.jsonld
index e53f800..af7c693 100644
--- a/releases/2.0.0/examples/address-kind.jsonld
+++ b/releases/2.0.0/examples/address-kind.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Na92f508d0e02482b8306828aff9a8c85",
+    "@id": "_:N214677b369e94b09a81af610a14cb4a3",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/agent.jsonld b/releases/2.0.0/examples/agent.jsonld
index 0997646..2254b2b 100644
--- a/releases/2.0.0/examples/agent.jsonld
+++ b/releases/2.0.0/examples/agent.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N71ccd39ed6784efbbba9a609ac80fcdc",
+    "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
+      "http://www.w3.org/ns/locn#Address"
     ],
-    "http://www.w3.org/ns/locn#address": [
+    "http://www.w3.org/ns/locn#adminUnitL1": [
       {
-      "@id": "_:N47793150fa234b499af358825b8e6e49"
+      "@value": "Denmark"
       }
     ],
-    "http://xmlns.com/foaf/0.1/mbox": [
+    "http://www.w3.org/ns/locn#adminUnitL2": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "K"
       }
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/ns/locn#postCode": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "1050"
       }
     ],
-    "http://xmlns.com/foaf/0.1/phone": [
+    "http://www.w3.org/ns/locn#postName": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/ns/locn#thoroughfare": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N47793150fa234b499af358825b8e6e49",
+    "@id": "_:N4492ff2123b646a982392c9207fc04e8",
     "@type": [
-      "http://www.w3.org/ns/locn#Address"
-    ],
-    "http://www.w3.org/ns/locn#adminUnitL1": [
-      {
-      "@value": "Denmark"
-      }
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
-    "http://www.w3.org/ns/locn#adminUnitL2": [
+    "http://www.w3.org/ns/locn#address": [
       {
-      "@value": "K"
+      "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6"
       }
     ],
-    "http://www.w3.org/ns/locn#postCode": [
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@value": "1050"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/ns/locn#postName": [
+    "http://xmlns.com/foaf/0.1/name": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/ns/locn#thoroughfare": [
+    "http://xmlns.com/foaf/0.1/phone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/attribution.jsonld b/releases/2.0.0/examples/attribution.jsonld
index 916e63e..b45d412 100644
--- a/releases/2.0.0/examples/attribution.jsonld
+++ b/releases/2.0.0/examples/attribution.jsonld
@@ -2,15 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
-    "http://www.w3.org/ns/prov#qualifiedAttribution": [
-      {
-      "@id": "_:N05e7b35aeadf42169d59007f65915fc4"
-      }
-    ]
-    },
-    {
-    "@id": "_:N3061c1ca402b42259f11d1f1264ad268",
+    "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -41,30 +33,22 @@
     ]
     },
     {
-    "@id": "_:N05e7b35aeadf42169d59007f65915fc4",
-    "@type": [
-      "http://www.w3.org/ns/prov#Attribution"
-    ],
-    "http://www.w3.org/ns/dcat#hadRole": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
-      }
-    ],
-    "http://www.w3.org/ns/prov#agent": [
+    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
+    "http://www.w3.org/ns/prov#qualifiedAttribution": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      "@id": "_:Na18b2b216eae4e55838d3b710de72e7e"
       }
     ]
     },
     {
     "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization",
-      "http://www.w3.org/ns/prov#Organization"
+      "http://www.w3.org/ns/prov#Organization",
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
     "http://www.w3.org/ns/locn#address": [
       {
-      "@id": "_:N3061c1ca402b42259f11d1f1264ad268"
+      "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee"
       }
     ],
     "http://xmlns.com/foaf/0.1/mbox": [
@@ -78,8 +62,24 @@
       "@value": "European Environment Agency"
       }
     ]
+    },
+    {
+    "@id": "_:Na18b2b216eae4e55838d3b710de72e7e",
+    "@type": [
+      "http://www.w3.org/ns/prov#Attribution"
+    ],
+    "http://www.w3.org/ns/dcat#hadRole": [
+      {
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
+      }
+    ],
+    "http://www.w3.org/ns/prov#agent": [
+      {
+      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/attribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/attribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/catalogue-record.jsonld b/releases/2.0.0/examples/catalogue-record.jsonld
index e7ce9f7..92392b2 100644
--- a/releases/2.0.0/examples/catalogue-record.jsonld
+++ b/releases/2.0.0/examples/catalogue-record.jsonld
@@ -29,12 +29,12 @@
     ],
     "http://purl.org/dc/terms/source": [
       {
-      "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47"
+      "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N76717cbb555a4c098a558ced6487f3f1"
+      "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e"
       }
     ],
     "http://xmlns.com/foaf/0.1/primaryTopic": [
@@ -44,7 +44,7 @@
     ]
     },
     {
-    "@id": "_:N76717cbb555a4c098a558ced6487f3f1",
+    "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Organization"
     ],
@@ -56,7 +56,7 @@
     ],
     "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1"
+      "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc"
       }
     ],
     "http://www.w3.org/2006/vcard/ns#hasEmail": [
@@ -66,20 +66,41 @@
     ]
     },
     {
-    "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2011/content#characterEncoding": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@value": "UTF-8"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87",
+    "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf",
+    "@type": [
+      "http://purl.org/dc/terms/Standard"
+    ],
     "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
@@ -94,37 +115,22 @@
     ]
     },
     {
-    "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1",
+    "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/dcat#CatalogRecord"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@value": "K"
+      "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2011/content#characterEncoding": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@value": "UTF-8"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/catalogue-record.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/catalogue-record.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/catalogue-record.rdf b/releases/2.0.0/examples/catalogue-record.rdf
index 028fcf3..e438a54 100644
--- a/releases/2.0.0/examples/catalogue-record.rdf
+++ b/releases/2.0.0/examples/catalogue-record.rdf
@@ -22,8 +22,7 @@
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
     <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2020-03-25</dct:modified>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:sdi@eea.europa.eu"/>
         <vcard:hasAddress>
@@ -35,15 +34,19 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb</dct:identifier>
-    <dct:source rdf:parseType="Resource">
-      <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
-      <dct:conformsTo rdf:parseType="Resource">
-        <dct:title xml:lang="en">ISO 19119/19139</dct:title>
-        <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
-      </dct:conformsTo>
+    <dct:source>
+      <dcat:CatalogRecord>
+        <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
+        <dct:conformsTo>
+          <dct:Standard>
+            <dct:title xml:lang="en">ISO 19119/19139</dct:title>
+            <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
+          </dct:Standard>
+        </dct:conformsTo>
+      </dcat:CatalogRecord>
     </dct:source>
   </rdf:Description>
 
diff --git a/releases/2.0.0/examples/catalogue-record.ttl b/releases/2.0.0/examples/catalogue-record.ttl
index 6c01370..673a19b 100644
--- a/releases/2.0.0/examples/catalogue-record.ttl
+++ b/releases/2.0.0/examples/catalogue-record.ttl
@@ -18,7 +18,9 @@ record:af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb a dcat:CatalogRecord ;
   dct:identifier "af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb"^^xsd:string ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:modified "2020-03-25"^^xsd:date ;
-  dct:source [ dct:conformsTo [ dct:title "ISO 19119/19139"@en ;
+  dct:source [ a dcat:CatalogRecord ;
+      dct:conformsTo [ a dct:Standard ;
+          dct:title "ISO 19119/19139"@en ;
           owl:versionInfo "1.0"@en ] ;
       cnt:characterEncoding "UTF-8"^^xsd:string ] ;
   dcat:contactPoint [ a vcard:Organization ;
diff --git a/releases/2.0.0/examples/category-scheme.jsonld b/releases/2.0.0/examples/category-scheme.jsonld
index 31b7157..30b9b36 100644
--- a/releases/2.0.0/examples/category-scheme.jsonld
+++ b/releases/2.0.0/examples/category-scheme.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bd1f63866614d1491a18e7f39533145",
+    "@id": "_:Nd87a301c581b4986bc7fd4eab871ba3d",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category-scheme.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category-scheme.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/category.jsonld b/releases/2.0.0/examples/category.jsonld
index 75e2a5c..cef8e14 100644
--- a/releases/2.0.0/examples/category.jsonld
+++ b/releases/2.0.0/examples/category.jsonld
@@ -2,41 +2,41 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb909be1ca823434caa2794d873572a46",
+    "@id": "_:N87ac041d036347db9e91fd6da2c3fbc8",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
-    "http://purl.org/dc/terms/issued": [
+    "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2010-07-06"
+      "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1"
       }
     ],
-    "http://purl.org/dc/terms/title": [
+    "http://www.w3.org/2004/02/skos/core#prefLabel": [
       {
       "@language": "en",
-      "@value": "EEA categories"
+      "@value": "geospatial data"
       }
     ]
     },
     {
-    "@id": "_:N86f9c508ef4a4214a367b2418e8f751b",
+    "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept"
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
-    "http://www.w3.org/2004/02/skos/core#inScheme": [
+    "http://purl.org/dc/terms/issued": [
       {
-      "@id": "_:Nb909be1ca823434caa2794d873572a46"
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2010-07-06"
       }
     ],
-    "http://www.w3.org/2004/02/skos/core#prefLabel": [
+    "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
-      "@value": "geospatial data"
+      "@value": "EEA categories"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/data-service.jsonld b/releases/2.0.0/examples/data-service.jsonld
index 66196ba..94d7935 100644
--- a/releases/2.0.0/examples/data-service.jsonld
+++ b/releases/2.0.0/examples/data-service.jsonld
@@ -2,113 +2,40 @@
   {
   "@graph": [
     {
-    "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
-      }
-    ]
-    },
-    {
-    "@id": "_:N8443a2cfbf8f48af94e3603906bd4628",
-    "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
-    ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "No limitations in the use of this web service."
-      }
-    ]
-    },
-    {
-    "@id": "_:Nd4a9379e223848aa920829f37d0ce429",
+    "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/prov#Plan"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
-      {
-      "@value": "K"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
       }
     ]
     },
     {
-    "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41",
+    "@id": "_:N8f860ccaf3e3439e989e19924d14befc",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
-    ],
-    "http://xmlns.com/foaf/0.1/mbox": [
-      {
-      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
       "@language": "en",
-      "@value": "Tracasa"
+      "@value": "European Environment Agency"
       }
-    ]
-    },
-    {
-    "@id": "_:N3c7fa1a1161647e097f1518721be8b38",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N538447af99804281b76f4085d9868399"
+      "@id": "_:N0840f1ab5fb04ef1b613eade764f080e"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
-      {
-      "@id": "_:N1684d0298ed24d9a817c684031e999d8"
-      }
-    ]
-    },
-    {
-    "@id": "_:N1684d0298ed24d9a817c684031e999d8",
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96"
-      }
-    ]
-    },
-    {
-    "@id": "_:N538447af99804281b76f4085d9868399",
-    "http://purl.org/dc/terms/description": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "mailto:info@eea.europa.eu"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "http://www.eea.europa.eu"
       }
     ]
     },
@@ -124,7 +51,7 @@
     ],
     "http://data.europa.eu/930/processor": [
       {
-      "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41"
+      "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c"
       }
     ],
     "http://purl.org/dc/terms/accessRights": [
@@ -134,19 +61,19 @@
     ],
     "http://purl.org/dc/terms/conformsTo": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
       },
       {
       "@id": "http://www.opengis.net/def/crs/EPSG/0/3857"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
       }
     ],
     "http://purl.org/dc/terms/description": [
@@ -168,12 +95,12 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N8443a2cfbf8f48af94e3603906bd4628"
+      "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b"
+      "@id": "_:N8b13e29737e34d09ad6635286a74c692"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -184,15 +111,15 @@
     ],
     "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09"
+      "@id": "_:N8f860ccaf3e3439e989e19924d14befc"
       }
     ],
     "http://www.w3.org/ns/dcat#endpointDescription": [
@@ -214,7 +141,7 @@
     "http://www.w3.org/ns/dcat#keyword": [
       {
       "@language": "en",
-      "@value": "Water Information System for Europe"
+      "@value": "Groundwater body"
       },
       {
       "@language": "en",
@@ -222,7 +149,7 @@
       },
       {
       "@language": "en",
-      "@value": "Groundwater body"
+      "@value": "Water Information System for Europe"
       },
       {
       "@language": "en",
@@ -236,24 +163,24 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://inspire.ec.europa.eu/theme/ef"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
+      "@id": "http://inspire.ec.europa.eu/theme/ef"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
       },
       {
       "@id": "http://www.eionet.europa.eu/gemet/concept/5352"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:N3c7fa1a1161647e097f1518721be8b38"
+      "@id": "_:N4bab8d10f72249f196bc4011acc751fb"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -263,41 +190,126 @@
     ]
     },
     {
-    "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96",
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+    "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c",
+    "@type": [
+      "http://xmlns.com/foaf/0.1/Organization"
+    ],
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
+      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
+      }
+    ],
+    "http://xmlns.com/foaf/0.1/name": [
+      {
+      "@language": "en",
+      "@value": "Tracasa"
       }
     ]
     },
     {
-    "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09",
+    "@id": "_:N4bab8d10f72249f196bc4011acc751fb",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/ns/prov#generated": [
+      {
+      "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ncfff83d157fa4a4e9f687d0850091880"
+      }
+    ]
+    },
+    {
+    "@id": "_:N0840f1ab5fb04ef1b613eade764f080e",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
+      {
+      "@value": "Denmark"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#locality": [
+      {
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
+      }
+    ]
+    },
+    {
+    "@id": "_:N8b13e29737e34d09ad6635286a74c692",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "No limitations in the use of this web service."
       }
+    ]
+    },
+    {
+    "@id": "_:Ncfff83d157fa4a4e9f687d0850091880",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@id": "_:Nd4a9379e223848aa920829f37d0ce429"
+      "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b"
       }
+    ]
+    },
+    {
+    "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf",
+    "@type": [
+      "http://www.w3.org/ns/prov#Entity"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@id": "mailto:info@eea.europa.eu"
+      "@language": "en",
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://www.eea.europa.eu"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/data-service.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/data-service.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/data-service.rdf b/releases/2.0.0/examples/data-service.rdf
index 19665d0..001dc24 100644
--- a/releases/2.0.0/examples/data-service.rdf
+++ b/releases/2.0.0/examples/data-service.rdf
@@ -38,9 +38,11 @@
     <dct:identifier>eea_v_4326_250_k_wise-eionet-monitoring-sites_service</dct:identifier>
     <dcat:servesDataset rdf:resource="https://some.catalogue/resource/eea_v_4326_250_k_wise-eionet_p_2001-2020_v01_r04"/>
     <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2018-09-15</dct:issued>
     <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
@@ -56,14 +58,20 @@
     </dct:license>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
diff --git a/releases/2.0.0/examples/data-service.ttl b/releases/2.0.0/examples/data-service.ttl
index f416156..4423863 100644
--- a/releases/2.0.0/examples/data-service.ttl
+++ b/releases/2.0.0/examples/data-service.ttl
@@ -35,7 +35,8 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
   dct:issued "2018-09-15"^^xsd:date ;
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "No limitations in the use of this web service."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"^^gsp:wktLiteral ] ;
   dct:title "EIONET monitoring sites - Web Service"@en ;
   dct:type <http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service>,
@@ -65,8 +66,11 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
     <http://www.eionet.europa.eu/gemet/concept/5352>,
     <http://www.eionet.europa.eu/gemet/concept/8229> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
   foaf:isPrimaryTopicOf <https://some.catalogue/record/29e08b66-e6f6-4b4f-95ad-b582d9fe3df5> .
 
diff --git a/releases/2.0.0/examples/dataset.jsonld b/releases/2.0.0/examples/dataset.jsonld
index 0ad7f9e..5347c80 100644
--- a/releases/2.0.0/examples/dataset.jsonld
+++ b/releases/2.0.0/examples/dataset.jsonld
@@ -2,7 +2,53 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59",
+    "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Organization"
+    ],
+    "http://www.w3.org/2006/vcard/ns#fn": [
+      {
+      "@language": "en",
+      "@value": "European Environment Agency"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+      {
+      "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+      {
+      "@id": "mailto:info@eea.europa.eu"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
+      {
+      "@id": "http://www.eea.europa.eu"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nc37713e3651a4584ba26842bbaaffac3",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
     "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
       "@id": "http://data.europa.eu/eli/reg/2010/1089"
@@ -53,28 +99,28 @@
     ],
     "http://purl.org/dc/terms/provenance": [
       {
-      "@id": "_:N353ea95227a845878efab4fda323b6ca"
+      "@id": "_:N4c7e51874d2241e491db292700082270"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:N6e6b81660d34443d8458df13dafbfdf2"
+      "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f"
       }
     ],
     "http://purl.org/dc/terms/subject": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
       }
     ],
     "http://purl.org/dc/terms/temporal": [
       {
-      "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe"
+      "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -90,12 +136,12 @@
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N81ec0f86630e4137b485eb58b7b4899b"
+      "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80"
       }
     ],
     "http://www.w3.org/ns/dcat#distribution": [
       {
-      "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc"
+      "@id": "_:Ne79a28d361cc4548a6095efa5890e41e"
       }
     ],
     "http://www.w3.org/ns/dcat#keyword": [
@@ -105,19 +151,19 @@
       },
       {
       "@language": "en",
-      "@value": "Noise map"
+      "@value": "agglomerations"
       },
       {
       "@language": "en",
-      "@value": "noise contour"
+      "@value": "Noise map"
       },
       {
       "@language": "en",
-      "@value": "Environmental Noise Directive"
+      "@value": "noise contour"
       },
       {
       "@language": "en",
-      "@value": "agglomerations"
+      "@value": "Environmental Noise Directive"
       }
     ],
     "http://www.w3.org/ns/dcat#spatialResolutionInMeters": [
@@ -128,18 +174,18 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
+      "@id": "http://inspire.ec.europa.eu/theme/hh"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
+      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/theme/hh"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:Nc146e31a488842fab5b3c97b93bdef51"
+      "@id": "_:N048a94230f534891a2585ac6332f9cba"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -154,114 +200,99 @@
     ]
     },
     {
-    "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointDescription": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointURL": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
+      "@value": "1050"
       }
-    ]
-    },
-    {
-    "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe",
-    "http://www.w3.org/ns/prov#hadPlan": [
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8",
-    "http://purl.org/dc/terms/description": [
+    "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a",
+    "@type": [
+      "http://www.w3.org/ns/dcat#DataService"
+    ],
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/ns/dcat#endpointDescription": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      }
+    ],
+    "http://www.w3.org/ns/dcat#endpointURL": [
+      {
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
       }
     ]
     },
     {
-    "@id": "_:N6e6b81660d34443d8458df13dafbfdf2",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
-      },
+    "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      "@id": "_:Nc37713e3651a4584ba26842bbaaffac3"
       }
     ]
     },
     {
-    "@id": "_:N447fdc84767e4600b3976599c7b3de91",
+    "@id": "_:N4c7e51874d2241e491db292700082270",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://purl.org/dc/terms/ProvenanceStatement"
     ],
     "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
       }
     ]
     },
     {
-    "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc",
+    "@id": "_:N85b46c116bf14fa9b76080caa17f2169",
     "@type": [
-      "http://www.w3.org/ns/dcat#Distribution"
-    ],
-    "http://purl.org/dc/terms/accessRights": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
-      }
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/description": [
       {
       "@language": "en",
-      "@value": "NoiseContours_air_lnight"
-      }
-    ],
-    "http://purl.org/dc/terms/format": [
-      {
-      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
-      }
-    ],
-    "http://purl.org/dc/terms/license": [
-      {
-      "@id": "_:N447fdc84767e4600b3976599c7b3de91"
-      }
-    ],
-    "http://www.w3.org/ns/adms#representationTechnique": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
-      }
-    ],
-    "http://www.w3.org/ns/dcat#accessService": [
-      {
-      "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260"
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/ns/dcat#accessURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     },
     {
-    "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe",
+    "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -279,92 +310,76 @@
     ]
     },
     {
-    "@id": "_:N353ea95227a845878efab4fda323b6ca",
+    "@id": "_:N048a94230f534891a2585ac6332f9cba",
     "@type": [
-      "http://purl.org/dc/terms/ProvenanceStatement"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
+    "http://www.w3.org/ns/prov#generated": [
       {
-      "@language": "en",
-      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
+      "@id": "_:N85b46c116bf14fa9b76080caa17f2169"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea"
       }
     ]
     },
     {
-    "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c",
+    "@id": "_:Ne79a28d361cc4548a6095efa5890e41e",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
+      "http://www.w3.org/ns/dcat#Distribution"
     ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
+    "http://purl.org/dc/terms/accessRights": [
       {
-      "@value": "Denmark"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "NoiseContours_air_lnight"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://purl.org/dc/terms/format": [
       {
-      "@value": "1050"
+      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/license": [
       {
-      "@value": "K"
+      "@id": "_:N611e92150c174750b4f33f9b66659314"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/adms#representationTechnique": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
       }
-    ]
-    },
-    {
-    "@id": "_:Nc146e31a488842fab5b3c97b93bdef51",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8"
+      "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+    "http://www.w3.org/ns/dcat#accessURL": [
       {
-      "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
       }
     ]
     },
     {
-    "@id": "_:N81ec0f86630e4137b485eb58b7b4899b",
+    "@id": "_:N611e92150c174750b4f33f9b66659314",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://purl.org/dc/terms/LicenseDocument"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
-      {
-      "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
-      {
-      "@id": "mailto:info@eea.europa.eu"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
-      {
-      "@id": "http://www.eea.europa.eu"
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/dataset.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/dataset.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/dataset.rdf b/releases/2.0.0/examples/dataset.rdf
index e4fc9f3..fa91aaa 100644
--- a/releases/2.0.0/examples/dataset.rdf
+++ b/releases/2.0.0/examples/dataset.rdf
@@ -42,9 +42,11 @@
     <dcat:theme rdf:resource="http://www.eionet.europa.eu/gemet/concept/2884"/>
     <dct:identifier>eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00</dct:identifier>
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:temporal>
       <dct:PeriodOfTime>
@@ -62,14 +64,20 @@
     <dcat:spatialResolutionInMeters rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">10</dcat:spatialResolutionInMeters>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
@@ -77,10 +85,12 @@
     <dcat:distribution>
       <dcat:Distribution>
         <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-        <dcat:accessService rdf:parseType="Resource">
-          <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-          <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-          <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+        <dcat:accessService>
+          <dcat:DataService>
+            <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+            <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+            <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+          </dcat:DataService>
         </dcat:accessService>
         <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
         <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
@@ -94,8 +104,7 @@
       </dcat:Distribution>
     </dcat:distribution>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:info@eea.europa.eu"/>
         <vcard:hasURL rdf:resource="http://www.eea.europa.eu"/>
@@ -108,7 +117,7 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <geodcat:custodian rdf:resource="http://publications.europa.eu/resource/authority/corporate-body/EEA"/>
   </rdf:Description>
diff --git a/releases/2.0.0/examples/dataset.ttl b/releases/2.0.0/examples/dataset.ttl
index a20077e..1a28229 100644
--- a/releases/2.0.0/examples/dataset.ttl
+++ b/releases/2.0.0/examples/dataset.ttl
@@ -31,7 +31,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:provenance [ a dct:ProvenanceStatement ;
       rdfs:label "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"^^gsp:wktLiteral ] ;
   dct:subject <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment>,
     <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health>,
@@ -58,7 +59,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
       dct:license [ a dct:LicenseDocument ;
           rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
       adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-      dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+      dcat:accessService [ a dcat:DataService ;
+          dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
           dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
           dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
       dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ] ;
@@ -72,9 +74,12 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
     <http://publications.europa.eu/resource/authority/data-theme/HEAL>,
     <http://www.eionet.europa.eu/gemet/concept/2884> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
   foaf:isPrimaryTopicOf record:e7807ecb-a8e6-4a33-baa2-d119eec9ce24 ;
   foaf:page <https://noise.eea.europa.eu/> .
 
diff --git a/releases/2.0.0/examples/distribution.jsonld b/releases/2.0.0/examples/distribution.jsonld
index 3bde226..71d0bb1 100644
--- a/releases/2.0.0/examples/distribution.jsonld
+++ b/releases/2.0.0/examples/distribution.jsonld
@@ -2,19 +2,10 @@
   {
   "@graph": [
     {
-    "@id": "_:N394a10b0fe7c4212a8393d7767d8e398",
+    "@id": "_:N8f8fc6421225434f841f1884b184d17d",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://www.w3.org/ns/dcat#DataService"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
-      }
-    ]
-    },
-    {
-    "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b",
     "http://purl.org/dc/terms/conformsTo": [
       {
       "@id": "http://www.opengeospatial.org/standards/wms"
@@ -32,7 +23,19 @@
     ]
     },
     {
-    "@id": "_:N8c69889fd6d8447eb03657fd1039bb8a",
+    "@id": "_:N50e40864e6934766a61ec0fa123745f0",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
+      {
+      "@language": "en",
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      }
+    ]
+    },
+    {
+    "@id": "_:N35b40925d8ab4847912a450a2ff6c17d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
@@ -54,7 +57,7 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N394a10b0fe7c4212a8393d7767d8e398"
+      "@id": "_:N50e40864e6934766a61ec0fa123745f0"
       }
     ],
     "http://www.w3.org/ns/adms#representationTechnique": [
@@ -64,7 +67,7 @@
     ],
     "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b"
+      "@id": "_:N8f8fc6421225434f841f1884b184d17d"
       }
     ],
     "http://www.w3.org/ns/dcat#accessURL": [
@@ -74,6 +77,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/distribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/distribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/distribution.rdf b/releases/2.0.0/examples/distribution.rdf
index 0cdd298..8c760a0 100644
--- a/releases/2.0.0/examples/distribution.rdf
+++ b/releases/2.0.0/examples/distribution.rdf
@@ -10,10 +10,12 @@
 
   <dcat:Distribution>
     <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-    <dcat:accessService rdf:parseType="Resource">
-      <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-      <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-      <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+    <dcat:accessService>
+      <dcat:DataService>
+        <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+        <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+        <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+      </dcat:DataService>
     </dcat:accessService>
     <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
     <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
diff --git a/releases/2.0.0/examples/distribution.ttl b/releases/2.0.0/examples/distribution.ttl
index aa8a92b..4deeb12 100644
--- a/releases/2.0.0/examples/distribution.ttl
+++ b/releases/2.0.0/examples/distribution.ttl
@@ -13,7 +13,8 @@
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
   adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-  dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+  dcat:accessService [ a dcat:DataService ;
+      dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
       dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
       dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
   dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> .
diff --git a/releases/2.0.0/examples/document.jsonld b/releases/2.0.0/examples/document.jsonld
index 5400d09..2bccf75 100644
--- a/releases/2.0.0/examples/document.jsonld
+++ b/releases/2.0.0/examples/document.jsonld
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/kind.jsonld b/releases/2.0.0/examples/kind.jsonld
index b51ab8d..37e64d9 100644
--- a/releases/2.0.0/examples/kind.jsonld
+++ b/releases/2.0.0/examples/kind.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N9e60680ef6f7434db5c6be253a288a19",
+    "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/2006/vcard/ns#Address"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "_:N6292c5978a79402789ba1b2bc44c0bde"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "1050"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N6292c5978a79402789ba1b2bc44c0bde",
+    "@id": "_:Nc495f7b503074a87863284d5ec68a368",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@value": "1050"
+      "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@value": "K"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/licence-document.jsonld b/releases/2.0.0/examples/licence-document.jsonld
index e2be137..f4b8563 100644
--- a/releases/2.0.0/examples/licence-document.jsonld
+++ b/releases/2.0.0/examples/licence-document.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N72b16e72625143e0b5da03152b261dd3",
+    "@id": "_:N9a2c7ff3aa6f48b18061700d76a2e78f",
     "@type": [
       "http://purl.org/dc/terms/LicenseDocument"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/licence-document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/licence-document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/location-geom.jsonld b/releases/2.0.0/examples/location-geom.jsonld
index b5a47d2..5115831 100644
--- a/releases/2.0.0/examples/location-geom.jsonld
+++ b/releases/2.0.0/examples/location-geom.jsonld
@@ -2,22 +2,22 @@
   {
   "@graph": [
     {
-    "@id": "_:N759586605ebf41e185198f6810043b6c",
+    "@id": "_:N96e056233dac4daa927a49a5dc94b9e0",
     "@type": [
       "http://purl.org/dc/terms/Location"
     ],
     "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
       {
       "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
       "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-geom.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-geom.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/location-gn.jsonld b/releases/2.0.0/examples/location-gn.jsonld
index 227c447..89ef57f 100644
--- a/releases/2.0.0/examples/location-gn.jsonld
+++ b/releases/2.0.0/examples/location-gn.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb8df6606c3854a5aa4e7369777e03963",
+    "@id": "_:N3b31777483544c1e84ac00447a5f9213",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,10 +20,10 @@
     ]
     },
     {
-    "@id": "_:N3deccf30270a4926b897711acd1b537c",
+    "@id": "_:N2269ddc652564c0aafbeb0607e42ccf4",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept",
-      "http://purl.org/dc/terms/Location"
+      "http://purl.org/dc/terms/Location",
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
     "http://purl.org/dc/terms/identifier": [
       {
@@ -32,7 +32,7 @@
     ],
     "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@id": "_:Nb8df6606c3854a5aa4e7369777e03963"
+      "@id": "_:N3b31777483544c1e84ac00447a5f9213"
       }
     ],
     "http://www.w3.org/2004/02/skos/core#prefLabel": [
@@ -43,6 +43,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-gn.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-gn.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/media-type.jsonld b/releases/2.0.0/examples/media-type.jsonld
index 01f2a43..24f63c7 100644
--- a/releases/2.0.0/examples/media-type.jsonld
+++ b/releases/2.0.0/examples/media-type.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b",
+    "@id": "_:Nf78592ee237d45baaf2b991752201416",
     "@type": [
       "http://purl.org/dc/terms/MediaType"
     ],
@@ -13,17 +13,17 @@
     ]
     },
     {
-    "@id": "_:Na8e226f6c01e4eef901034d70a794229",
+    "@id": "_:N33b9b001ad6a4d5ba5a47d296d4a958d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
     "http://purl.org/dc/terms/format": [
       {
-      "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b"
+      "@id": "_:Nf78592ee237d45baaf2b991752201416"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/media-type.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/media-type.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/metric.jsonld b/releases/2.0.0/examples/metric.jsonld
index d34640c..4791c86 100644
--- a/releases/2.0.0/examples/metric.jsonld
+++ b/releases/2.0.0/examples/metric.jsonld
@@ -90,6 +90,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/metric.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/metric.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/period-of-time-with-owl-time.jsonld b/releases/2.0.0/examples/period-of-time-with-owl-time.jsonld
index 4a01c50..5af6972 100644
--- a/releases/2.0.0/examples/period-of-time-with-owl-time.jsonld
+++ b/releases/2.0.0/examples/period-of-time-with-owl-time.jsonld
@@ -2,40 +2,46 @@
   {
   "@graph": [
     {
-    "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb",
-    "http://www.w3.org/2006/time#inXSDDate": [
-      {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2016-01-01"
-      }
-    ]
-    },
-    {
-    "@id": "_:N5a2d171fa13149ebb763f109f8b9b38e",
+    "@id": "_:N949e1558128e48afb7851376bb7b641e",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
     "http://www.w3.org/2006/time#hasBeginning": [
       {
-      "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb"
+      "@id": "_:N2ce1edd3347a46c7a523119367e2daab"
       }
     ],
     "http://www.w3.org/2006/time#hasEnd": [
       {
-      "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67"
+      "@id": "_:Ndb358e6bb2b64395bff110170569b4e7"
       }
     ]
     },
     {
-    "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67",
+    "@id": "_:Ndb358e6bb2b64395bff110170569b4e7",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
     "http://www.w3.org/2006/time#inXSDDate": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#date",
       "@value": "2016-12-31"
       }
     ]
+    },
+    {
+    "@id": "_:N2ce1edd3347a46c7a523119367e2daab",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
+    "http://www.w3.org/2006/time#inXSDDate": [
+      {
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2016-01-01"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time-with-owl-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time-with-owl-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/period-of-time-with-owl-time.rdf b/releases/2.0.0/examples/period-of-time-with-owl-time.rdf
index 601d52b..26ebb5f 100644
--- a/releases/2.0.0/examples/period-of-time-with-owl-time.rdf
+++ b/releases/2.0.0/examples/period-of-time-with-owl-time.rdf
@@ -7,11 +7,15 @@
 >
 
   <dct:PeriodOfTime>
-    <time:hasBeginning rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+    <time:hasBeginning>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+      </time:Instant>
     </time:hasBeginning>
-    <time:hasEnd rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+    <time:hasEnd>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+      </time:Instant>
     </time:hasEnd>
   </dct:PeriodOfTime>
 
diff --git a/releases/2.0.0/examples/period-of-time-with-owl-time.ttl b/releases/2.0.0/examples/period-of-time-with-owl-time.ttl
index d0cd87b..d54ab5e 100644
--- a/releases/2.0.0/examples/period-of-time-with-owl-time.ttl
+++ b/releases/2.0.0/examples/period-of-time-with-owl-time.ttl
@@ -6,6 +6,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 [] a dct:PeriodOfTime ;
-  time:hasBeginning [ time:inXSDDate "2016-01-01"^^xsd:date ] ;
-  time:hasEnd [ time:inXSDDate "2016-12-31"^^xsd:date ] .
+  time:hasBeginning [ a time:Instant ;
+      time:inXSDDate "2016-01-01"^^xsd:date ] ;
+  time:hasEnd [ a time:Instant ;
+      time:inXSDDate "2016-12-31"^^xsd:date ] .
 
diff --git a/releases/2.0.0/examples/period-of-time.jsonld b/releases/2.0.0/examples/period-of-time.jsonld
index 24888c5..45fab20 100644
--- a/releases/2.0.0/examples/period-of-time.jsonld
+++ b/releases/2.0.0/examples/period-of-time.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bc410bb379146a58b2781da610c243c",
+    "@id": "_:N807e64eb96f344eaa5ddbb3912b2d774",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/provenance-statement.jsonld b/releases/2.0.0/examples/provenance-statement.jsonld
index 80f6548..76a488a 100644
--- a/releases/2.0.0/examples/provenance-statement.jsonld
+++ b/releases/2.0.0/examples/provenance-statement.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N8a66edc6ef8a483eb6669b330c98403d",
+    "@id": "_:N40eef4339c2e4f37b62af4808535f4a0",
     "@type": [
       "http://purl.org/dc/terms/ProvenanceStatement"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/provenance-statement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/provenance-statement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/quality-measurement.jsonld b/releases/2.0.0/examples/quality-measurement.jsonld
index e3742c8..7523545 100644
--- a/releases/2.0.0/examples/quality-measurement.jsonld
+++ b/releases/2.0.0/examples/quality-measurement.jsonld
@@ -2,37 +2,24 @@
   {
   "@graph": [
     {
-    "@id": "_:N742cf61b8df54978a84b03fda45df953",
+    "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
-    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
-      {
-      "@id": "http://www.qudt.org/vocab/unit/M"
-      }
-    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "10"
-      }
-    ]
-    },
-    {
-    "@id": "https://some.catalogue/resource/d45678",
-    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
-      {
-      "@id": "_:N742cf61b8df54978a84b03fda45df953"
+      "@value": "0.000001"
       }
     ]
     },
     {
-    "@id": "_:N816080ae92364b909759bec8fca5ce78",
+    "@id": "_:N34bd32b179154448bf83eeb02bead81e",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -54,15 +41,15 @@
     ]
     },
     {
-    "@id": "https://some.catalogue/resource/c34567",
+    "@id": "https://some.catalogue/resource/d45678",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N816080ae92364b909759bec8fca5ce78"
+      "@id": "_:N3785e6c39d704866be6b80622d2161e3"
       }
     ]
     },
     {
-    "@id": "_:N18fada498a4a436fa06fc3ae4489ccba",
+    "@id": "_:N3785e6c39d704866be6b80622d2161e3",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -73,30 +60,43 @@
     ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "100"
+      "@value": "10"
+      }
+    ]
+    },
+    {
+    "@id": "https://some.catalogue/resource/c34567",
+    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
+      {
+      "@id": "_:N34bd32b179154448bf83eeb02bead81e"
       }
     ]
     },
     {
-    "@id": "_:N0bcdac561ae047cb9a2077d808e072fb",
+    "@id": "_:Nfa33069a4a7443318609c69475a60772",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
+    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
+      {
+      "@id": "http://www.qudt.org/vocab/unit/M"
+      }
+    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "0.000001"
+      "@value": "100"
       }
     ]
     },
@@ -104,7 +104,7 @@
     "@id": "https://some.catalogue/resource/a12345",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N0bcdac561ae047cb9a2077d808e072fb"
+      "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799"
       }
     ]
     },
@@ -112,11 +112,11 @@
     "@id": "https://some.catalogue/resource/b23456",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N18fada498a4a436fa06fc3ae4489ccba"
+      "@id": "_:Nfa33069a4a7443318609c69475a60772"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/quality-measurement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/quality-measurement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/standard-crs.jsonld b/releases/2.0.0/examples/standard-crs.jsonld
index ad0b15a..7607adc 100644
--- a/releases/2.0.0/examples/standard-crs.jsonld
+++ b/releases/2.0.0/examples/standard-crs.jsonld
@@ -1,18 +1,6 @@
 [
   {
   "@graph": [
-    {
-    "@id": "http://www.opengis.net/def/crs/OGC",
-    "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
-    ],
-    "http://purl.org/dc/terms/title": [
-      {
-      "@language": "en",
-      "@value": "OGC Coordinate Reference Systems"
-      }
-    ]
-    },
     {
     "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
     "@type": [
@@ -46,8 +34,20 @@
       "@value": "CRS84"
       }
     ]
+    },
+    {
+    "@id": "http://www.opengis.net/def/crs/OGC",
+    "@type": [
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+    ],
+    "http://purl.org/dc/terms/title": [
+      {
+      "@language": "en",
+      "@value": "OGC Coordinate Reference Systems"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-crs.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-crs.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/standard-ir.jsonld b/releases/2.0.0/examples/standard-ir.jsonld
index cb2bdd1..9e69477 100644
--- a/releases/2.0.0/examples/standard-ir.jsonld
+++ b/releases/2.0.0/examples/standard-ir.jsonld
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-ir.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-ir.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/2.0.0/examples/standard-md.jsonld b/releases/2.0.0/examples/standard-md.jsonld
index 6ff71f1..ec699e0 100644
--- a/releases/2.0.0/examples/standard-md.jsonld
+++ b/releases/2.0.0/examples/standard-md.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N18ad7702a4e74d058a2e41063082d15c",
+    "@id": "_:Nfe59b8f29790426c98c9ca3a0a0646c1",
     "@type": [
       "http://purl.org/dc/terms/Standard"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-md.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-md.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/activity.jsonld b/releases/examples/activity.jsonld
index 4181a05..1ceb073 100644
--- a/releases/examples/activity.jsonld
+++ b/releases/examples/activity.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6",
+    "@id": "_:N6a64c1b02b694581bb2388823133b623",
     "@type": [
       "http://www.w3.org/ns/prov#Entity"
     ],
@@ -19,40 +19,18 @@
     ]
     },
     {
-    "@id": "_:N385fea47c4c8463b965a249e511a8de6",
-    "@type": [
-      "http://www.w3.org/ns/prov#Plan"
-    ],
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
-      {
-      "@id": "http://data.europa.eu/eli/reg/2010/1089"
-      }
-    ]
-    },
-    {
-    "@id": "_:N297540213321443a84f90245195b6267",
-    "@type": [
-      "http://www.w3.org/ns/prov#Association"
-    ],
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:N385fea47c4c8463b965a249e511a8de6"
-      }
-    ]
-    },
-    {
-    "@id": "_:Nb86a88d0e2474b82b3c5658366964eec",
+    "@id": "_:Nc58a33cab50b4cb8afa95f125014dc9e",
     "@type": [
       "http://www.w3.org/ns/prov#Activity"
     ],
     "http://www.w3.org/ns/prov#generated": [
       {
-      "@id": "_:Nbbc7180d10e7422580ae6402250ed7b6"
+      "@id": "_:N6a64c1b02b694581bb2388823133b623"
       }
     ],
     "http://www.w3.org/ns/prov#qualifiedAssociation": [
       {
-      "@id": "_:N297540213321443a84f90245195b6267"
+      "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246"
       }
     ],
     "http://www.w3.org/ns/prov#used": [
@@ -64,8 +42,8 @@
     {
     "@id": "http://data.europa.eu/eli/reg/2010/1089",
     "@type": [
-      "http://www.w3.org/ns/prov#Entity",
-      "http://purl.org/dc/terms/Standard"
+      "http://purl.org/dc/terms/Standard",
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/issued": [
       {
@@ -79,8 +57,30 @@
       "@value": "\n    Commission Regulation (EU) No 1089/2010 of 23 November 2010 \n    implementing Directive 2007/2/EC of the European Parliament \n    and of the Council as regards interoperability of spatial \n    data sets and services\n  "
       }
     ]
+    },
+    {
+    "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+      {
+      "@id": "http://data.europa.eu/eli/reg/2010/1089"
+      }
+    ]
+    },
+    {
+    "@id": "_:Neebc077e961b41a89acfb5fa0aaa1246",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
+      {
+      "@id": "_:N90e8b22b901b4e3c8e641adbd6c69ebb"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/activity.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/activity.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/address-agent.jsonld b/releases/examples/address-agent.jsonld
index 147a640..b2c678d 100644
--- a/releases/examples/address-agent.jsonld
+++ b/releases/examples/address-agent.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N3c54b3221f154c3ca637b0b0a97cc03a",
+    "@id": "_:N2a509977f6fb4515aad82b0dde964b85",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/address-kind.jsonld b/releases/examples/address-kind.jsonld
index e53f800..af7c693 100644
--- a/releases/examples/address-kind.jsonld
+++ b/releases/examples/address-kind.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Na92f508d0e02482b8306828aff9a8c85",
+    "@id": "_:N214677b369e94b09a81af610a14cb4a3",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Address"
     ],
@@ -33,6 +33,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/address-kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/address-kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/agent.jsonld b/releases/examples/agent.jsonld
index 0997646..2254b2b 100644
--- a/releases/examples/agent.jsonld
+++ b/releases/examples/agent.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N71ccd39ed6784efbbba9a609ac80fcdc",
+    "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
+      "http://www.w3.org/ns/locn#Address"
     ],
-    "http://www.w3.org/ns/locn#address": [
+    "http://www.w3.org/ns/locn#adminUnitL1": [
       {
-      "@id": "_:N47793150fa234b499af358825b8e6e49"
+      "@value": "Denmark"
       }
     ],
-    "http://xmlns.com/foaf/0.1/mbox": [
+    "http://www.w3.org/ns/locn#adminUnitL2": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "K"
       }
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/ns/locn#postCode": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "1050"
       }
     ],
-    "http://xmlns.com/foaf/0.1/phone": [
+    "http://www.w3.org/ns/locn#postName": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/ns/locn#thoroughfare": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N47793150fa234b499af358825b8e6e49",
+    "@id": "_:N4492ff2123b646a982392c9207fc04e8",
     "@type": [
-      "http://www.w3.org/ns/locn#Address"
-    ],
-    "http://www.w3.org/ns/locn#adminUnitL1": [
-      {
-      "@value": "Denmark"
-      }
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
-    "http://www.w3.org/ns/locn#adminUnitL2": [
+    "http://www.w3.org/ns/locn#address": [
       {
-      "@value": "K"
+      "@id": "_:N0482edc68d474fe8b8780a5ad8d21af6"
       }
     ],
-    "http://www.w3.org/ns/locn#postCode": [
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@value": "1050"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/ns/locn#postName": [
+    "http://xmlns.com/foaf/0.1/name": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/ns/locn#thoroughfare": [
+    "http://xmlns.com/foaf/0.1/phone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/agent.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/agent.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/attribution.jsonld b/releases/examples/attribution.jsonld
index 916e63e..b45d412 100644
--- a/releases/examples/attribution.jsonld
+++ b/releases/examples/attribution.jsonld
@@ -2,15 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
-    "http://www.w3.org/ns/prov#qualifiedAttribution": [
-      {
-      "@id": "_:N05e7b35aeadf42169d59007f65915fc4"
-      }
-    ]
-    },
-    {
-    "@id": "_:N3061c1ca402b42259f11d1f1264ad268",
+    "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee",
     "@type": [
       "http://www.w3.org/ns/locn#Address"
     ],
@@ -41,30 +33,22 @@
     ]
     },
     {
-    "@id": "_:N05e7b35aeadf42169d59007f65915fc4",
-    "@type": [
-      "http://www.w3.org/ns/prov#Attribution"
-    ],
-    "http://www.w3.org/ns/dcat#hadRole": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
-      }
-    ],
-    "http://www.w3.org/ns/prov#agent": [
+    "@id": "https://some.catalogue/resource/eea_v_4326_1_mio_EU27-2020-basemap_i_2020_v01_r00",
+    "http://www.w3.org/ns/prov#qualifiedAttribution": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      "@id": "_:Na18b2b216eae4e55838d3b710de72e7e"
       }
     ]
     },
     {
     "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization",
-      "http://www.w3.org/ns/prov#Organization"
+      "http://www.w3.org/ns/prov#Organization",
+      "http://xmlns.com/foaf/0.1/Organization"
     ],
     "http://www.w3.org/ns/locn#address": [
       {
-      "@id": "_:N3061c1ca402b42259f11d1f1264ad268"
+      "@id": "_:Nbffeda638f9c4047bad6ef63d4309bee"
       }
     ],
     "http://xmlns.com/foaf/0.1/mbox": [
@@ -78,8 +62,24 @@
       "@value": "European Environment Agency"
       }
     ]
+    },
+    {
+    "@id": "_:Na18b2b216eae4e55838d3b710de72e7e",
+    "@type": [
+      "http://www.w3.org/ns/prov#Attribution"
+    ],
+    "http://www.w3.org/ns/dcat#hadRole": [
+      {
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResponsiblePartyRole/pointOfContact"
+      }
+    ],
+    "http://www.w3.org/ns/prov#agent": [
+      {
+      "@id": "http://publications.europa.eu/resource/authority/corporate-body/EEA"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/attribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/attribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/catalogue-record.jsonld b/releases/examples/catalogue-record.jsonld
index e7ce9f7..92392b2 100644
--- a/releases/examples/catalogue-record.jsonld
+++ b/releases/examples/catalogue-record.jsonld
@@ -29,12 +29,12 @@
     ],
     "http://purl.org/dc/terms/source": [
       {
-      "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47"
+      "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N76717cbb555a4c098a558ced6487f3f1"
+      "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e"
       }
     ],
     "http://xmlns.com/foaf/0.1/primaryTopic": [
@@ -44,7 +44,7 @@
     ]
     },
     {
-    "@id": "_:N76717cbb555a4c098a558ced6487f3f1",
+    "@id": "_:N6fd2651c2a084099a4d46aa7b1ad4f1e",
     "@type": [
       "http://www.w3.org/2006/vcard/ns#Organization"
     ],
@@ -56,7 +56,7 @@
     ],
     "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1"
+      "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc"
       }
     ],
     "http://www.w3.org/2006/vcard/ns#hasEmail": [
@@ -66,20 +66,41 @@
     ]
     },
     {
-    "@id": "_:Ne1c5a9f70aea417eb7f6224e98567c47",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:N90b98ea231b146b59523bd9bf9a6d9fc",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2011/content#characterEncoding": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@value": "UTF-8"
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:Ndb55d9602b9b4557a249b80b6c9ede87",
+    "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf",
+    "@type": [
+      "http://purl.org/dc/terms/Standard"
+    ],
     "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
@@ -94,37 +115,22 @@
     ]
     },
     {
-    "@id": "_:N474001b553dd46f3b5115ddd8d3d27b1",
+    "@id": "_:N7f6ddc1dc6c84e1dbc9edd02f210d01a",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/dcat#CatalogRecord"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@value": "K"
+      "@id": "_:N55678cfd6de0473c8a6efe69e0303bdf"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2011/content#characterEncoding": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@value": "UTF-8"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/catalogue-record.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/catalogue-record.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/catalogue-record.rdf b/releases/examples/catalogue-record.rdf
index 028fcf3..e438a54 100644
--- a/releases/examples/catalogue-record.rdf
+++ b/releases/examples/catalogue-record.rdf
@@ -22,8 +22,7 @@
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
     <dct:modified rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2020-03-25</dct:modified>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:sdi@eea.europa.eu"/>
         <vcard:hasAddress>
@@ -35,15 +34,19 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <dct:identifier rdf:datatype="http://www.w3.org/2001/XMLSchema#string">af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb</dct:identifier>
-    <dct:source rdf:parseType="Resource">
-      <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
-      <dct:conformsTo rdf:parseType="Resource">
-        <dct:title xml:lang="en">ISO 19119/19139</dct:title>
-        <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
-      </dct:conformsTo>
+    <dct:source>
+      <dcat:CatalogRecord>
+        <cnt:characterEncoding rdf:datatype="http://www.w3.org/2001/XMLSchema#string">UTF-8</cnt:characterEncoding>
+        <dct:conformsTo>
+          <dct:Standard>
+            <dct:title xml:lang="en">ISO 19119/19139</dct:title>
+            <owl:versionInfo xml:lang="en">1.0</owl:versionInfo>
+          </dct:Standard>
+        </dct:conformsTo>
+      </dcat:CatalogRecord>
     </dct:source>
   </rdf:Description>
 
diff --git a/releases/examples/catalogue-record.ttl b/releases/examples/catalogue-record.ttl
index 6c01370..673a19b 100644
--- a/releases/examples/catalogue-record.ttl
+++ b/releases/examples/catalogue-record.ttl
@@ -18,7 +18,9 @@ record:af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb a dcat:CatalogRecord ;
   dct:identifier "af4c4fd6-0485-45c8-b6bc-8a8ed12aa3eb"^^xsd:string ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:modified "2020-03-25"^^xsd:date ;
-  dct:source [ dct:conformsTo [ dct:title "ISO 19119/19139"@en ;
+  dct:source [ a dcat:CatalogRecord ;
+      dct:conformsTo [ a dct:Standard ;
+          dct:title "ISO 19119/19139"@en ;
           owl:versionInfo "1.0"@en ] ;
       cnt:characterEncoding "UTF-8"^^xsd:string ] ;
   dcat:contactPoint [ a vcard:Organization ;
diff --git a/releases/examples/category-scheme.jsonld b/releases/examples/category-scheme.jsonld
index 31b7157..30b9b36 100644
--- a/releases/examples/category-scheme.jsonld
+++ b/releases/examples/category-scheme.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bd1f63866614d1491a18e7f39533145",
+    "@id": "_:Nd87a301c581b4986bc7fd4eab871ba3d",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category-scheme.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category-scheme.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/category.jsonld b/releases/examples/category.jsonld
index 75e2a5c..cef8e14 100644
--- a/releases/examples/category.jsonld
+++ b/releases/examples/category.jsonld
@@ -2,41 +2,41 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb909be1ca823434caa2794d873572a46",
+    "@id": "_:N87ac041d036347db9e91fd6da2c3fbc8",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
-    "http://purl.org/dc/terms/issued": [
+    "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2010-07-06"
+      "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1"
       }
     ],
-    "http://purl.org/dc/terms/title": [
+    "http://www.w3.org/2004/02/skos/core#prefLabel": [
       {
       "@language": "en",
-      "@value": "EEA categories"
+      "@value": "geospatial data"
       }
     ]
     },
     {
-    "@id": "_:N86f9c508ef4a4214a367b2418e8f751b",
+    "@id": "_:Ne3bf091feeb94de78ef8f2ed90608ca1",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept"
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
-    "http://www.w3.org/2004/02/skos/core#inScheme": [
+    "http://purl.org/dc/terms/issued": [
       {
-      "@id": "_:Nb909be1ca823434caa2794d873572a46"
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2010-07-06"
       }
     ],
-    "http://www.w3.org/2004/02/skos/core#prefLabel": [
+    "http://purl.org/dc/terms/title": [
       {
       "@language": "en",
-      "@value": "geospatial data"
+      "@value": "EEA categories"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/category.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/category.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/data-service.jsonld b/releases/examples/data-service.jsonld
index 66196ba..94d7935 100644
--- a/releases/examples/data-service.jsonld
+++ b/releases/examples/data-service.jsonld
@@ -2,113 +2,40 @@
   {
   "@graph": [
     {
-    "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
-      }
-    ]
-    },
-    {
-    "@id": "_:N8443a2cfbf8f48af94e3603906bd4628",
-    "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
-    ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "No limitations in the use of this web service."
-      }
-    ]
-    },
-    {
-    "@id": "_:Nd4a9379e223848aa920829f37d0ce429",
+    "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
-      {
-      "@value": "Copenhagen"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
-      {
-      "@value": "1050"
-      }
+      "http://www.w3.org/ns/prov#Plan"
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
-      {
-      "@value": "K"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
       }
     ]
     },
     {
-    "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41",
+    "@id": "_:N8f860ccaf3e3439e989e19924d14befc",
     "@type": [
-      "http://xmlns.com/foaf/0.1/Organization"
-    ],
-    "http://xmlns.com/foaf/0.1/mbox": [
-      {
-      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://xmlns.com/foaf/0.1/name": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
       "@language": "en",
-      "@value": "Tracasa"
+      "@value": "European Environment Agency"
       }
-    ]
-    },
-    {
-    "@id": "_:N3c7fa1a1161647e097f1518721be8b38",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@id": "_:N538447af99804281b76f4085d9868399"
+      "@id": "_:N0840f1ab5fb04ef1b613eade764f080e"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
-      {
-      "@id": "_:N1684d0298ed24d9a817c684031e999d8"
-      }
-    ]
-    },
-    {
-    "@id": "_:N1684d0298ed24d9a817c684031e999d8",
-    "http://www.w3.org/ns/prov#hadPlan": [
-      {
-      "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96"
-      }
-    ]
-    },
-    {
-    "@id": "_:N538447af99804281b76f4085d9868399",
-    "http://purl.org/dc/terms/description": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "mailto:info@eea.europa.eu"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "http://www.eea.europa.eu"
       }
     ]
     },
@@ -124,7 +51,7 @@
     ],
     "http://data.europa.eu/930/processor": [
       {
-      "@id": "_:N890ca1b6b69f4bfb9ab5a3b5313f5f41"
+      "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c"
       }
     ],
     "http://purl.org/dc/terms/accessRights": [
@@ -134,19 +61,19 @@
     ],
     "http://purl.org/dc/terms/conformsTo": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
       },
       {
       "@id": "http://www.opengis.net/def/crs/EPSG/0/3857"
       },
       {
-      "@id": "http://www.opengis.net/def/crs/EPSG/0/102100"
+      "@id": "http://www.opengis.net/def/crs/EPSG/0/4326"
       }
     ],
     "http://purl.org/dc/terms/description": [
@@ -168,12 +95,12 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N8443a2cfbf8f48af94e3603906bd4628"
+      "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:Nfc1b3b2dfa3d4ee0b16325ab9282ad9b"
+      "@id": "_:N8b13e29737e34d09ad6635286a74c692"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -184,15 +111,15 @@
     ],
     "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service"
       }
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09"
+      "@id": "_:N8f860ccaf3e3439e989e19924d14befc"
       }
     ],
     "http://www.w3.org/ns/dcat#endpointDescription": [
@@ -214,7 +141,7 @@
     "http://www.w3.org/ns/dcat#keyword": [
       {
       "@language": "en",
-      "@value": "Water Information System for Europe"
+      "@value": "Groundwater body"
       },
       {
       "@language": "en",
@@ -222,7 +149,7 @@
       },
       {
       "@language": "en",
-      "@value": "Groundwater body"
+      "@value": "Water Information System for Europe"
       },
       {
       "@language": "en",
@@ -236,24 +163,24 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://inspire.ec.europa.eu/theme/ef"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
+      "@id": "http://inspire.ec.europa.eu/theme/ef"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/3780"
       },
       {
       "@id": "http://www.eionet.europa.eu/gemet/concept/5352"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/12301"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/8229"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:N3c7fa1a1161647e097f1518721be8b38"
+      "@id": "_:N4bab8d10f72249f196bc4011acc751fb"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -263,41 +190,126 @@
     ]
     },
     {
-    "@id": "_:Ne58218e0bdcc4a508e0410b87b1ebf96",
-    "http://www.w3.org/ns/prov#wasDerivedFrom": [
+    "@id": "_:Nc6f5fd036dbc40b98f988cee02ed886c",
+    "@type": [
+      "http://xmlns.com/foaf/0.1/Organization"
+    ],
+    "http://xmlns.com/foaf/0.1/mbox": [
       {
-      "@id": "http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"
+      "@id": "mailto:wisesoe.helpdesk@eionet.europa.eu"
+      }
+    ],
+    "http://xmlns.com/foaf/0.1/name": [
+      {
+      "@language": "en",
+      "@value": "Tracasa"
       }
     ]
     },
     {
-    "@id": "_:Ne2e078425e55437b9bb72937ae9d5b09",
+    "@id": "_:N4bab8d10f72249f196bc4011acc751fb",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/ns/prov#generated": [
+      {
+      "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ncfff83d157fa4a4e9f687d0850091880"
+      }
+    ]
+    },
+    {
+    "@id": "_:N0840f1ab5fb04ef1b613eade764f080e",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
+      {
+      "@value": "Denmark"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#locality": [
+      {
+      "@value": "Copenhagen"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
+      {
+      "@value": "1050"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
+      {
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
+      }
+    ]
+    },
+    {
+    "@id": "_:N8b13e29737e34d09ad6635286a74c692",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nefdc78b19adb4a66ab964f8e1886bec2",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "No limitations in the use of this web service."
       }
+    ]
+    },
+    {
+    "@id": "_:Ncfff83d157fa4a4e9f687d0850091880",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@id": "_:Nd4a9379e223848aa920829f37d0ce429"
+      "@id": "_:Nad348d1d1918477eb96b21cc0ccb195b"
       }
+    ]
+    },
+    {
+    "@id": "_:N810b4fd4b5af4e6485b65f3afea4edaf",
+    "@type": [
+      "http://www.w3.org/ns/prov#Entity"
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@id": "mailto:info@eea.europa.eu"
+      "@language": "en",
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "http://www.eea.europa.eu"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/data-service.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/data-service.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/data-service.rdf b/releases/examples/data-service.rdf
index 19665d0..001dc24 100644
--- a/releases/examples/data-service.rdf
+++ b/releases/examples/data-service.rdf
@@ -38,9 +38,11 @@
     <dct:identifier>eea_v_4326_250_k_wise-eionet-monitoring-sites_service</dct:identifier>
     <dcat:servesDataset rdf:resource="https://some.catalogue/resource/eea_v_4326_250_k_wise-eionet_p_2001-2020_v01_r04"/>
     <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/SpatialDataServiceType/view"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:issued rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2018-09-15</dct:issued>
     <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
@@ -56,14 +58,20 @@
     </dct:license>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
diff --git a/releases/examples/data-service.ttl b/releases/examples/data-service.ttl
index f416156..4423863 100644
--- a/releases/examples/data-service.ttl
+++ b/releases/examples/data-service.ttl
@@ -35,7 +35,8 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
   dct:issued "2018-09-15"^^xsd:date ;
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "No limitations in the use of this web service."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"^^gsp:wktLiteral ] ;
   dct:title "EIONET monitoring sites - Web Service"@en ;
   dct:type <http://inspire.ec.europa.eu/metadata-codelist/ResourceType/service>,
@@ -65,8 +66,11 @@ resource:eea_v_4326_250_k_wise-eionet-monitoring-sites_service a dcat:DataServic
     <http://www.eionet.europa.eu/gemet/concept/5352>,
     <http://www.eionet.europa.eu/gemet/concept/8229> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://inspire.ec.europa.eu/id/citation/ir/reg-976-2009> ] ] ] ;
   foaf:isPrimaryTopicOf <https://some.catalogue/record/29e08b66-e6f6-4b4f-95ad-b582d9fe3df5> .
 
diff --git a/releases/examples/dataset.jsonld b/releases/examples/dataset.jsonld
index 0ad7f9e..5347c80 100644
--- a/releases/examples/dataset.jsonld
+++ b/releases/examples/dataset.jsonld
@@ -2,7 +2,53 @@
   {
   "@graph": [
     {
-    "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59",
+    "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Organization"
+    ],
+    "http://www.w3.org/2006/vcard/ns#fn": [
+      {
+      "@language": "en",
+      "@value": "European Environment Agency"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+      {
+      "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+      {
+      "@id": "mailto:info@eea.europa.eu"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#hasURL": [
+      {
+      "@id": "http://www.eea.europa.eu"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f",
+    "@type": [
+      "http://purl.org/dc/terms/Location"
+    ],
+    "http://www.w3.org/ns/dcat#bbox": [
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
+      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      }
+    ]
+    },
+    {
+    "@id": "_:Nc37713e3651a4584ba26842bbaaffac3",
+    "@type": [
+      "http://www.w3.org/ns/prov#Plan"
+    ],
     "http://www.w3.org/ns/prov#wasDerivedFrom": [
       {
       "@id": "http://data.europa.eu/eli/reg/2010/1089"
@@ -53,28 +99,28 @@
     ],
     "http://purl.org/dc/terms/provenance": [
       {
-      "@id": "_:N353ea95227a845878efab4fda323b6ca"
+      "@id": "_:N4c7e51874d2241e491db292700082270"
       }
     ],
     "http://purl.org/dc/terms/spatial": [
       {
-      "@id": "_:N6e6b81660d34443d8458df13dafbfdf2"
+      "@id": "_:Nf9635bc79a4448c9b1228afbc35bee3f"
       }
     ],
     "http://purl.org/dc/terms/subject": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/transportation"
       }
     ],
     "http://purl.org/dc/terms/temporal": [
       {
-      "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe"
+      "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f"
       }
     ],
     "http://purl.org/dc/terms/title": [
@@ -90,12 +136,12 @@
     ],
     "http://www.w3.org/ns/dcat#contactPoint": [
       {
-      "@id": "_:N81ec0f86630e4137b485eb58b7b4899b"
+      "@id": "_:N2ddcd1f920ed4f44a00f0e2230e46d80"
       }
     ],
     "http://www.w3.org/ns/dcat#distribution": [
       {
-      "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc"
+      "@id": "_:Ne79a28d361cc4548a6095efa5890e41e"
       }
     ],
     "http://www.w3.org/ns/dcat#keyword": [
@@ -105,19 +151,19 @@
       },
       {
       "@language": "en",
-      "@value": "Noise map"
+      "@value": "agglomerations"
       },
       {
       "@language": "en",
-      "@value": "noise contour"
+      "@value": "Noise map"
       },
       {
       "@language": "en",
-      "@value": "Environmental Noise Directive"
+      "@value": "noise contour"
       },
       {
       "@language": "en",
-      "@value": "agglomerations"
+      "@value": "Environmental Noise Directive"
       }
     ],
     "http://www.w3.org/ns/dcat#spatialResolutionInMeters": [
@@ -128,18 +174,18 @@
     ],
     "http://www.w3.org/ns/dcat#theme": [
       {
-      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
+      "@id": "http://inspire.ec.europa.eu/theme/hh"
       },
       {
-      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
+      "@id": "http://publications.europa.eu/resource/authority/data-theme/HEAL"
       },
       {
-      "@id": "http://inspire.ec.europa.eu/theme/hh"
+      "@id": "http://www.eionet.europa.eu/gemet/concept/2884"
       }
     ],
     "http://www.w3.org/ns/prov#wasUsedBy": [
       {
-      "@id": "_:Nc146e31a488842fab5b3c97b93bdef51"
+      "@id": "_:N048a94230f534891a2585ac6332f9cba"
       }
     ],
     "http://xmlns.com/foaf/0.1/isPrimaryTopicOf": [
@@ -154,114 +200,99 @@
     ]
     },
     {
-    "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260",
-    "http://purl.org/dc/terms/conformsTo": [
+    "@id": "_:Nbe0b11db4ec246d784285f7af68a00b2",
+    "@type": [
+      "http://www.w3.org/2006/vcard/ns#Address"
+    ],
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@id": "http://www.opengeospatial.org/standards/wms"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointDescription": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/ns/dcat#endpointURL": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
+      "@value": "1050"
       }
-    ]
-    },
-    {
-    "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe",
-    "http://www.w3.org/ns/prov#hadPlan": [
+    ],
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "_:Nbab09a38aacc468eb52a1fe8645cfa59"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8",
-    "http://purl.org/dc/terms/description": [
+    "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a",
+    "@type": [
+      "http://www.w3.org/ns/dcat#DataService"
+    ],
+    "http://purl.org/dc/terms/conformsTo": [
       {
-      "@language": "en",
-      "@value": "See the referenced specification"
+      "@id": "http://www.opengeospatial.org/standards/wms"
       }
     ],
-    "http://purl.org/dc/terms/type": [
+    "http://www.w3.org/ns/dcat#endpointDescription": [
       {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      }
+    ],
+    "http://www.w3.org/ns/dcat#endpointURL": [
+      {
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"
       }
     ]
     },
     {
-    "@id": "_:N6e6b81660d34443d8458df13dafbfdf2",
-    "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"
-      },
+    "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea",
+    "@type": [
+      "http://www.w3.org/ns/prov#Association"
+    ],
+    "http://www.w3.org/ns/prov#hadPlan": [
       {
-      "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
-      "@value": "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"
+      "@id": "_:Nc37713e3651a4584ba26842bbaaffac3"
       }
     ]
     },
     {
-    "@id": "_:N447fdc84767e4600b3976599c7b3de91",
+    "@id": "_:N4c7e51874d2241e491db292700082270",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://purl.org/dc/terms/ProvenanceStatement"
     ],
     "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
       }
     ]
     },
     {
-    "@id": "_:Na26c958b8ea14d62a3f7546b9ad57fdc",
+    "@id": "_:N85b46c116bf14fa9b76080caa17f2169",
     "@type": [
-      "http://www.w3.org/ns/dcat#Distribution"
-    ],
-    "http://purl.org/dc/terms/accessRights": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
-      }
+      "http://www.w3.org/ns/prov#Entity"
     ],
     "http://purl.org/dc/terms/description": [
       {
       "@language": "en",
-      "@value": "NoiseContours_air_lnight"
-      }
-    ],
-    "http://purl.org/dc/terms/format": [
-      {
-      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
-      }
-    ],
-    "http://purl.org/dc/terms/license": [
-      {
-      "@id": "_:N447fdc84767e4600b3976599c7b3de91"
-      }
-    ],
-    "http://www.w3.org/ns/adms#representationTechnique": [
-      {
-      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
-      }
-    ],
-    "http://www.w3.org/ns/dcat#accessService": [
-      {
-      "@id": "_:Ne6d7342b3d5d4deda8c9051f2dfb9260"
+      "@value": "See the referenced specification"
       }
     ],
-    "http://www.w3.org/ns/dcat#accessURL": [
+    "http://purl.org/dc/terms/type": [
       {
-      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"
       }
     ]
     },
     {
-    "@id": "_:Na25c4a2c3b2e447e925421b6e8a598fe",
+    "@id": "_:Ne86ce5ad668e4f95b3aa6e938029ee5f",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -279,92 +310,76 @@
     ]
     },
     {
-    "@id": "_:N353ea95227a845878efab4fda323b6ca",
+    "@id": "_:N048a94230f534891a2585ac6332f9cba",
     "@type": [
-      "http://purl.org/dc/terms/ProvenanceStatement"
+      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
+    "http://www.w3.org/ns/prov#generated": [
       {
-      "@language": "en",
-      "@value": "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."
+      "@id": "_:N85b46c116bf14fa9b76080caa17f2169"
+      }
+    ],
+    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+      {
+      "@id": "_:Ne1e9ccbed2804eefac78f91e1efb9bea"
       }
     ]
     },
     {
-    "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c",
+    "@id": "_:Ne79a28d361cc4548a6095efa5890e41e",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
+      "http://www.w3.org/ns/dcat#Distribution"
     ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
+    "http://purl.org/dc/terms/accessRights": [
       {
-      "@value": "Denmark"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://purl.org/dc/terms/description": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "NoiseContours_air_lnight"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://purl.org/dc/terms/format": [
       {
-      "@value": "1050"
+      "@id": "http://publications.europa.eu/resource/authority/file-type/TIFF"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://purl.org/dc/terms/license": [
       {
-      "@value": "K"
+      "@id": "_:N611e92150c174750b4f33f9b66659314"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/ns/adms#representationTechnique": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid"
       }
-    ]
-    },
-    {
-    "@id": "_:Nc146e31a488842fab5b3c97b93bdef51",
-    "@type": [
-      "http://www.w3.org/ns/prov#Activity"
     ],
-    "http://www.w3.org/ns/prov#generated": [
+    "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N2f3eafd440e640658dd3d5a5db9aa7c8"
+      "@id": "_:Nd02e78f5d98c4b91ab4b487a939a776a"
       }
     ],
-    "http://www.w3.org/ns/prov#qualifiedAssociation": [
+    "http://www.w3.org/ns/dcat#accessURL": [
       {
-      "@id": "_:N043495f85a4b4ebfa7c331a60e2abbbe"
+      "@id": "https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS"
       }
     ]
     },
     {
-    "@id": "_:N81ec0f86630e4137b485eb58b7b4899b",
+    "@id": "_:N611e92150c174750b4f33f9b66659314",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://purl.org/dc/terms/LicenseDocument"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2000/01/rdf-schema#label": [
       {
       "@language": "en",
-      "@value": "European Environment Agency"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
-      {
-      "@id": "_:N24093f4f0d314a799031e7acd3bf7f7c"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
-      {
-      "@id": "mailto:info@eea.europa.eu"
-      }
-    ],
-    "http://www.w3.org/2006/vcard/ns#hasURL": [
-      {
-      "@id": "http://www.eea.europa.eu"
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/dataset.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/dataset.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/dataset.rdf b/releases/examples/dataset.rdf
index e4fc9f3..fa91aaa 100644
--- a/releases/examples/dataset.rdf
+++ b/releases/examples/dataset.rdf
@@ -42,9 +42,11 @@
     <dcat:theme rdf:resource="http://www.eionet.europa.eu/gemet/concept/2884"/>
     <dct:identifier>eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00</dct:identifier>
     <dct:language rdf:resource="http://publications.europa.eu/resource/authority/language/ENG"/>
-    <dct:spatial rdf:parseType="Resource">
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
-      <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+    <dct:spatial>
+      <dct:Location>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#wktLiteral"><![CDATA[POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))]]></dcat:bbox>
+        <dcat:bbox rdf:datatype="http://www.opengis.net/ont/geosparql#gmlLiteral"><![CDATA[<gml:Envelope srsName="http://www.opengis.net/def/crs/OGC/1.3/CRS84"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>]]></dcat:bbox>
+      </dct:Location>
     </dct:spatial>
     <dct:temporal>
       <dct:PeriodOfTime>
@@ -62,14 +64,20 @@
     <dcat:spatialResolutionInMeters rdf:datatype="http://www.w3.org/2001/XMLSchema#decimal">10</dcat:spatialResolutionInMeters>
     <prov:wasUsedBy>
       <prov:Activity>
-        <prov:qualifiedAssociation rdf:parseType="Resource">
-          <prov:hadPlan rdf:parseType="Resource">
-            <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
-          </prov:hadPlan>
+        <prov:qualifiedAssociation>
+          <prov:Association>
+            <prov:hadPlan>
+              <prov:Plan>
+                <prov:wasDerivedFrom rdf:resource="http://data.europa.eu/eli/reg/2010/1089"/>
+              </prov:Plan>
+            </prov:hadPlan>
+          </prov:Association>
         </prov:qualifiedAssociation>
-        <prov:generated rdf:parseType="Resource">
-          <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
-          <dct:description xml:lang="en">See the referenced specification</dct:description>
+        <prov:generated>
+          <prov:Entity>
+            <dct:type rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated"/>
+            <dct:description xml:lang="en">See the referenced specification</dct:description>
+          </prov:Entity>
         </prov:generated>
       </prov:Activity>
     </prov:wasUsedBy>
@@ -77,10 +85,12 @@
     <dcat:distribution>
       <dcat:Distribution>
         <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-        <dcat:accessService rdf:parseType="Resource">
-          <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-          <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-          <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+        <dcat:accessService>
+          <dcat:DataService>
+            <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+            <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+            <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+          </dcat:DataService>
         </dcat:accessService>
         <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
         <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
@@ -94,8 +104,7 @@
       </dcat:Distribution>
     </dcat:distribution>
     <dcat:contactPoint>
-      <rdf:Description>
-        <rdf:type rdf:resource="http://www.w3.org/2006/vcard/ns#Organization"/>
+      <vcard:Organization>
         <vcard:fn xml:lang="en">European Environment Agency</vcard:fn>
         <vcard:hasEmail rdf:resource="mailto:info@eea.europa.eu"/>
         <vcard:hasURL rdf:resource="http://www.eea.europa.eu"/>
@@ -108,7 +117,7 @@
             <vcard:country-name>Denmark</vcard:country-name>
           </vcard:Address>
         </vcard:hasAddress>
-      </rdf:Description>
+      </vcard:Organization>
     </dcat:contactPoint>
     <geodcat:custodian rdf:resource="http://publications.europa.eu/resource/authority/corporate-body/EEA"/>
   </rdf:Description>
diff --git a/releases/examples/dataset.ttl b/releases/examples/dataset.ttl
index a20077e..1a28229 100644
--- a/releases/examples/dataset.ttl
+++ b/releases/examples/dataset.ttl
@@ -31,7 +31,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
   dct:language <http://publications.europa.eu/resource/authority/language/ENG> ;
   dct:provenance [ a dct:ProvenanceStatement ;
       rdfs:label "The raster data sets have been created out of the Noise Spatial Database, which in turn contains all versions delivered by the relevant countries (EU and EFTA) to Reportnet (CDR). The data from Reportnet is automatically incorporated into the database, with the exception of those data sets which require a manual review (due to problems with naming conventions or Coordinate Reference System). The data set covers any submission by the countries until 01/01/2019."@en ] ;
-  dct:spatial [ dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
+  dct:spatial [ a dct:Location ;
+      dcat:bbox "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-31.285 27.642</gml:lowerCorner><gml:upperCorner>34.099 70.075</gml:upperCorner></gml:Envelope>"^^gsp:gmlLiteral,
         "POLYGON((-31.285 70.075,34.099 70.075,34.099 27.642,-31.285 27.642,-31.285 70.075))"^^gsp:wktLiteral ] ;
   dct:subject <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/environment>,
     <http://inspire.ec.europa.eu/metadata-codelist/TopicCategory/health>,
@@ -58,7 +59,8 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
       dct:license [ a dct:LicenseDocument ;
           rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
       adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-      dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+      dcat:accessService [ a dcat:DataService ;
+          dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
           dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
           dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
       dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ] ;
@@ -72,9 +74,12 @@ resource:eea_r_3035_10_m_noise-contours-end2017_i_2016_v01_r00 a dcat:Dataset ;
     <http://publications.europa.eu/resource/authority/data-theme/HEAL>,
     <http://www.eionet.europa.eu/gemet/concept/2884> ;
   prov:wasUsedBy [ a prov:Activity ;
-      prov:generated [ dct:description "See the referenced specification"@en ;
+      prov:generated [ a prov:Entity ;
+          dct:description "See the referenced specification"@en ;
           dct:type <http://inspire.ec.europa.eu/metadata-codelist/DegreeOfConformity/notEvaluated> ] ;
-      prov:qualifiedAssociation [ prov:hadPlan [ prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
+      prov:qualifiedAssociation [ a prov:Association ;
+          prov:hadPlan [ a prov:Plan ;
+              prov:wasDerivedFrom <http://data.europa.eu/eli/reg/2010/1089> ] ] ] ;
   foaf:isPrimaryTopicOf record:e7807ecb-a8e6-4a33-baa2-d119eec9ce24 ;
   foaf:page <https://noise.eea.europa.eu/> .
 
diff --git a/releases/examples/distribution.jsonld b/releases/examples/distribution.jsonld
index 3bde226..71d0bb1 100644
--- a/releases/examples/distribution.jsonld
+++ b/releases/examples/distribution.jsonld
@@ -2,19 +2,10 @@
   {
   "@graph": [
     {
-    "@id": "_:N394a10b0fe7c4212a8393d7767d8e398",
+    "@id": "_:N8f8fc6421225434f841f1884b184d17d",
     "@type": [
-      "http://purl.org/dc/terms/LicenseDocument"
+      "http://www.w3.org/ns/dcat#DataService"
     ],
-    "http://www.w3.org/2000/01/rdf-schema#label": [
-      {
-      "@language": "en",
-      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
-      }
-    ]
-    },
-    {
-    "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b",
     "http://purl.org/dc/terms/conformsTo": [
       {
       "@id": "http://www.opengeospatial.org/standards/wms"
@@ -32,7 +23,19 @@
     ]
     },
     {
-    "@id": "_:N8c69889fd6d8447eb03657fd1039bb8a",
+    "@id": "_:N50e40864e6934766a61ec0fa123745f0",
+    "@type": [
+      "http://purl.org/dc/terms/LicenseDocument"
+    ],
+    "http://www.w3.org/2000/01/rdf-schema#label": [
+      {
+      "@language": "en",
+      "@value": "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."
+      }
+    ]
+    },
+    {
+    "@id": "_:N35b40925d8ab4847912a450a2ff6c17d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
@@ -54,7 +57,7 @@
     ],
     "http://purl.org/dc/terms/license": [
       {
-      "@id": "_:N394a10b0fe7c4212a8393d7767d8e398"
+      "@id": "_:N50e40864e6934766a61ec0fa123745f0"
       }
     ],
     "http://www.w3.org/ns/adms#representationTechnique": [
@@ -64,7 +67,7 @@
     ],
     "http://www.w3.org/ns/dcat#accessService": [
       {
-      "@id": "_:N22c9b58307cb4990ba36526fb9cddb6b"
+      "@id": "_:N8f8fc6421225434f841f1884b184d17d"
       }
     ],
     "http://www.w3.org/ns/dcat#accessURL": [
@@ -74,6 +77,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/distribution.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/distribution.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/distribution.rdf b/releases/examples/distribution.rdf
index 0cdd298..8c760a0 100644
--- a/releases/examples/distribution.rdf
+++ b/releases/examples/distribution.rdf
@@ -10,10 +10,12 @@
 
   <dcat:Distribution>
     <dct:description xml:lang="en">NoiseContours_air_lnight</dct:description>
-    <dcat:accessService rdf:parseType="Resource">
-      <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
-      <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
-      <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+    <dcat:accessService>
+      <dcat:DataService>
+        <dcat:endpointURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer"/>
+        <dcat:endpointDescription rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
+        <dct:conformsTo rdf:resource="http://www.opengeospatial.org/standards/wms"/>
+      </dcat:DataService>
     </dcat:accessService>
     <dcat:accessURL rdf:resource="https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&amp;service=WMS"/>
     <dct:accessRights rdf:resource="http://inspire.ec.europa.eu/metadata-codelist/LimitationsOnPublicAccess/INSPIRE_Directive_Article13_1e"/>
diff --git a/releases/examples/distribution.ttl b/releases/examples/distribution.ttl
index aa8a92b..4deeb12 100644
--- a/releases/examples/distribution.ttl
+++ b/releases/examples/distribution.ttl
@@ -13,7 +13,8 @@
   dct:license [ a dct:LicenseDocument ;
       rdfs:label "The full noise contour maps data set is in principle only available for EEA internal use. A public version of the data set may in the future be available, excluding those data sets for which there is any limitation or restriction in their use (beyond acknowledgement)."@en ] ;
   adms:representationTechnique <http://inspire.ec.europa.eu/metadata-codelist/SpatialRepresentationType/grid> ;
-  dcat:accessService [ dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
+  dcat:accessService [ a dcat:DataService ;
+      dct:conformsTo <http://www.opengeospatial.org/standards/wms> ;
       dcat:endpointDescription <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> ;
       dcat:endpointURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer> ] ;
   dcat:accessURL <https://noise.discomap.eea.europa.eu/arcgis/services/noiseStoryMap/NoiseContours_air_lnight/ImageServer/WMSServer?request=GetCapabilities&service=WMS> .
diff --git a/releases/examples/document.jsonld b/releases/examples/document.jsonld
index 5400d09..2bccf75 100644
--- a/releases/examples/document.jsonld
+++ b/releases/examples/document.jsonld
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/kind.jsonld b/releases/examples/kind.jsonld
index b51ab8d..37e64d9 100644
--- a/releases/examples/kind.jsonld
+++ b/releases/examples/kind.jsonld
@@ -2,64 +2,64 @@
   {
   "@graph": [
     {
-    "@id": "_:N9e60680ef6f7434db5c6be253a288a19",
+    "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Organization"
+      "http://www.w3.org/2006/vcard/ns#Address"
     ],
-    "http://www.w3.org/2006/vcard/ns#fn": [
+    "http://www.w3.org/2006/vcard/ns#country-name": [
       {
-      "@language": "en",
-      "@value": "European Environment Agency"
+      "@value": "Denmark"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasAddress": [
+    "http://www.w3.org/2006/vcard/ns#locality": [
       {
-      "@id": "_:N6292c5978a79402789ba1b2bc44c0bde"
+      "@value": "Copenhagen"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasEmail": [
+    "http://www.w3.org/2006/vcard/ns#postal-code": [
       {
-      "@id": "mailto:sdi@eea.europa.eu"
+      "@value": "1050"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
+    "http://www.w3.org/2006/vcard/ns#region": [
       {
-      "@id": "tel:+451234567890"
+      "@value": "K"
+      }
+    ],
+    "http://www.w3.org/2006/vcard/ns#street-address": [
+      {
+      "@value": "Kongens Nytorv 6"
       }
     ]
     },
     {
-    "@id": "_:N6292c5978a79402789ba1b2bc44c0bde",
+    "@id": "_:Nc495f7b503074a87863284d5ec68a368",
     "@type": [
-      "http://www.w3.org/2006/vcard/ns#Address"
-    ],
-    "http://www.w3.org/2006/vcard/ns#country-name": [
-      {
-      "@value": "Denmark"
-      }
+      "http://www.w3.org/2006/vcard/ns#Organization"
     ],
-    "http://www.w3.org/2006/vcard/ns#locality": [
+    "http://www.w3.org/2006/vcard/ns#fn": [
       {
-      "@value": "Copenhagen"
+      "@language": "en",
+      "@value": "European Environment Agency"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#postal-code": [
+    "http://www.w3.org/2006/vcard/ns#hasAddress": [
       {
-      "@value": "1050"
+      "@id": "_:Ne669c91e5d1b48f2852e7d328aca3769"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#region": [
+    "http://www.w3.org/2006/vcard/ns#hasEmail": [
       {
-      "@value": "K"
+      "@id": "mailto:sdi@eea.europa.eu"
       }
     ],
-    "http://www.w3.org/2006/vcard/ns#street-address": [
+    "http://www.w3.org/2006/vcard/ns#hasTelephone": [
       {
-      "@value": "Kongens Nytorv 6"
+      "@id": "tel:+451234567890"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/kind.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/kind.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/licence-document.jsonld b/releases/examples/licence-document.jsonld
index e2be137..f4b8563 100644
--- a/releases/examples/licence-document.jsonld
+++ b/releases/examples/licence-document.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N72b16e72625143e0b5da03152b261dd3",
+    "@id": "_:N9a2c7ff3aa6f48b18061700d76a2e78f",
     "@type": [
       "http://purl.org/dc/terms/LicenseDocument"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/licence-document.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/licence-document.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/location-geom.jsonld b/releases/examples/location-geom.jsonld
index b5a47d2..5115831 100644
--- a/releases/examples/location-geom.jsonld
+++ b/releases/examples/location-geom.jsonld
@@ -2,22 +2,22 @@
   {
   "@graph": [
     {
-    "@id": "_:N759586605ebf41e185198f6810043b6c",
+    "@id": "_:N96e056233dac4daa927a49a5dc94b9e0",
     "@type": [
       "http://purl.org/dc/terms/Location"
     ],
     "http://www.w3.org/ns/dcat#bbox": [
-      {
-      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
-      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
-      },
       {
       "@type": "http://www.opengis.net/ont/geosparql#wktLiteral",
       "@value": "POLYGON((-62.9951 70.620781,55.813367 70.620781,55.813367 -21.378367,-62.9951 -21.378367,-62.9951 70.620781))"
+      },
+      {
+      "@type": "http://www.opengis.net/ont/geosparql#gmlLiteral",
+      "@value": "<gml:Envelope srsName=\"http://www.opengis.net/def/crs/OGC/1.3/CRS84\"><gml:lowerCorner>-62.9951 -21.378367</gml:lowerCorner><gml:upperCorner>55.813367 70.620781</gml:upperCorner></gml:Envelope>"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-geom.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-geom.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/location-gn.jsonld b/releases/examples/location-gn.jsonld
index 227c447..89ef57f 100644
--- a/releases/examples/location-gn.jsonld
+++ b/releases/examples/location-gn.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Nb8df6606c3854a5aa4e7369777e03963",
+    "@id": "_:N3b31777483544c1e84ac00447a5f9213",
     "@type": [
       "http://www.w3.org/2004/02/skos/core#ConceptScheme"
     ],
@@ -20,10 +20,10 @@
     ]
     },
     {
-    "@id": "_:N3deccf30270a4926b897711acd1b537c",
+    "@id": "_:N2269ddc652564c0aafbeb0607e42ccf4",
     "@type": [
-      "http://www.w3.org/2004/02/skos/core#Concept",
-      "http://purl.org/dc/terms/Location"
+      "http://purl.org/dc/terms/Location",
+      "http://www.w3.org/2004/02/skos/core#Concept"
     ],
     "http://purl.org/dc/terms/identifier": [
       {
@@ -32,7 +32,7 @@
     ],
     "http://www.w3.org/2004/02/skos/core#inScheme": [
       {
-      "@id": "_:Nb8df6606c3854a5aa4e7369777e03963"
+      "@id": "_:N3b31777483544c1e84ac00447a5f9213"
       }
     ],
     "http://www.w3.org/2004/02/skos/core#prefLabel": [
@@ -43,6 +43,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/location-gn.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/location-gn.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/media-type.jsonld b/releases/examples/media-type.jsonld
index 01f2a43..24f63c7 100644
--- a/releases/examples/media-type.jsonld
+++ b/releases/examples/media-type.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b",
+    "@id": "_:Nf78592ee237d45baaf2b991752201416",
     "@type": [
       "http://purl.org/dc/terms/MediaType"
     ],
@@ -13,17 +13,17 @@
     ]
     },
     {
-    "@id": "_:Na8e226f6c01e4eef901034d70a794229",
+    "@id": "_:N33b9b001ad6a4d5ba5a47d296d4a958d",
     "@type": [
       "http://www.w3.org/ns/dcat#Distribution"
     ],
     "http://purl.org/dc/terms/format": [
       {
-      "@id": "_:Ne2ecf4490f7b46619463c53a336a4c5b"
+      "@id": "_:Nf78592ee237d45baaf2b991752201416"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/media-type.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/media-type.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/metric.jsonld b/releases/examples/metric.jsonld
index d34640c..4791c86 100644
--- a/releases/examples/metric.jsonld
+++ b/releases/examples/metric.jsonld
@@ -90,6 +90,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/metric.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/metric.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/period-of-time-with-owl-time.jsonld b/releases/examples/period-of-time-with-owl-time.jsonld
index 4a01c50..5af6972 100644
--- a/releases/examples/period-of-time-with-owl-time.jsonld
+++ b/releases/examples/period-of-time-with-owl-time.jsonld
@@ -2,40 +2,46 @@
   {
   "@graph": [
     {
-    "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb",
-    "http://www.w3.org/2006/time#inXSDDate": [
-      {
-      "@type": "http://www.w3.org/2001/XMLSchema#date",
-      "@value": "2016-01-01"
-      }
-    ]
-    },
-    {
-    "@id": "_:N5a2d171fa13149ebb763f109f8b9b38e",
+    "@id": "_:N949e1558128e48afb7851376bb7b641e",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
     "http://www.w3.org/2006/time#hasBeginning": [
       {
-      "@id": "_:N0a5f84bf738f431d9c86a24dad081ffb"
+      "@id": "_:N2ce1edd3347a46c7a523119367e2daab"
       }
     ],
     "http://www.w3.org/2006/time#hasEnd": [
       {
-      "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67"
+      "@id": "_:Ndb358e6bb2b64395bff110170569b4e7"
       }
     ]
     },
     {
-    "@id": "_:N7cd56bb315cd483a8cbbd2ee5512ca67",
+    "@id": "_:Ndb358e6bb2b64395bff110170569b4e7",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
     "http://www.w3.org/2006/time#inXSDDate": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#date",
       "@value": "2016-12-31"
       }
     ]
+    },
+    {
+    "@id": "_:N2ce1edd3347a46c7a523119367e2daab",
+    "@type": [
+      "http://www.w3.org/2006/time#Instant"
+    ],
+    "http://www.w3.org/2006/time#inXSDDate": [
+      {
+      "@type": "http://www.w3.org/2001/XMLSchema#date",
+      "@value": "2016-01-01"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time-with-owl-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time-with-owl-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/period-of-time-with-owl-time.rdf b/releases/examples/period-of-time-with-owl-time.rdf
index 601d52b..26ebb5f 100644
--- a/releases/examples/period-of-time-with-owl-time.rdf
+++ b/releases/examples/period-of-time-with-owl-time.rdf
@@ -7,11 +7,15 @@
 >
 
   <dct:PeriodOfTime>
-    <time:hasBeginning rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+    <time:hasBeginning>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-01-01</time:inXSDDate>
+      </time:Instant>
     </time:hasBeginning>
-    <time:hasEnd rdf:parseType="Resource">
-      <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+    <time:hasEnd>
+      <time:Instant>
+        <time:inXSDDate rdf:datatype="http://www.w3.org/2001/XMLSchema#date">2016-12-31</time:inXSDDate>
+      </time:Instant>
     </time:hasEnd>
   </dct:PeriodOfTime>
 
diff --git a/releases/examples/period-of-time-with-owl-time.ttl b/releases/examples/period-of-time-with-owl-time.ttl
index d0cd87b..d54ab5e 100644
--- a/releases/examples/period-of-time-with-owl-time.ttl
+++ b/releases/examples/period-of-time-with-owl-time.ttl
@@ -6,6 +6,8 @@
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
 
 [] a dct:PeriodOfTime ;
-  time:hasBeginning [ time:inXSDDate "2016-01-01"^^xsd:date ] ;
-  time:hasEnd [ time:inXSDDate "2016-12-31"^^xsd:date ] .
+  time:hasBeginning [ a time:Instant ;
+      time:inXSDDate "2016-01-01"^^xsd:date ] ;
+  time:hasEnd [ a time:Instant ;
+      time:inXSDDate "2016-12-31"^^xsd:date ] .
 
diff --git a/releases/examples/period-of-time.jsonld b/releases/examples/period-of-time.jsonld
index 24888c5..45fab20 100644
--- a/releases/examples/period-of-time.jsonld
+++ b/releases/examples/period-of-time.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N6bc410bb379146a58b2781da610c243c",
+    "@id": "_:N807e64eb96f344eaa5ddbb3912b2d774",
     "@type": [
       "http://purl.org/dc/terms/PeriodOfTime"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/period-of-time.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/period-of-time.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/provenance-statement.jsonld b/releases/examples/provenance-statement.jsonld
index 80f6548..76a488a 100644
--- a/releases/examples/provenance-statement.jsonld
+++ b/releases/examples/provenance-statement.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N8a66edc6ef8a483eb6669b330c98403d",
+    "@id": "_:N40eef4339c2e4f37b62af4808535f4a0",
     "@type": [
       "http://purl.org/dc/terms/ProvenanceStatement"
     ],
@@ -14,6 +14,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/provenance-statement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/provenance-statement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/quality-measurement.jsonld b/releases/examples/quality-measurement.jsonld
index e3742c8..7523545 100644
--- a/releases/examples/quality-measurement.jsonld
+++ b/releases/examples/quality-measurement.jsonld
@@ -2,37 +2,24 @@
   {
   "@graph": [
     {
-    "@id": "_:N742cf61b8df54978a84b03fda45df953",
+    "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
-    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
-      {
-      "@id": "http://www.qudt.org/vocab/unit/M"
-      }
-    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "10"
-      }
-    ]
-    },
-    {
-    "@id": "https://some.catalogue/resource/d45678",
-    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
-      {
-      "@id": "_:N742cf61b8df54978a84b03fda45df953"
+      "@value": "0.000001"
       }
     ]
     },
     {
-    "@id": "_:N816080ae92364b909759bec8fca5ce78",
+    "@id": "_:N34bd32b179154448bf83eeb02bead81e",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -54,15 +41,15 @@
     ]
     },
     {
-    "@id": "https://some.catalogue/resource/c34567",
+    "@id": "https://some.catalogue/resource/d45678",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N816080ae92364b909759bec8fca5ce78"
+      "@id": "_:N3785e6c39d704866be6b80622d2161e3"
       }
     ]
     },
     {
-    "@id": "_:N18fada498a4a436fa06fc3ae4489ccba",
+    "@id": "_:N3785e6c39d704866be6b80622d2161e3",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
@@ -73,30 +60,43 @@
     ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsVerticalDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "100"
+      "@value": "10"
+      }
+    ]
+    },
+    {
+    "@id": "https://some.catalogue/resource/c34567",
+    "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
+      {
+      "@id": "_:N34bd32b179154448bf83eeb02bead81e"
       }
     ]
     },
     {
-    "@id": "_:N0bcdac561ae047cb9a2077d808e072fb",
+    "@id": "_:Nfa33069a4a7443318609c69475a60772",
     "@type": [
       "http://www.w3.org/ns/dqv#QualityMeasurement"
     ],
+    "http://purl.org/linked-data/sdmx/2009/attribute#unitMeasure": [
+      {
+      "@id": "http://www.qudt.org/vocab/unit/M"
+      }
+    ],
     "http://www.w3.org/ns/dqv#isMeasurementOf": [
       {
-      "@id": "http://data.europa.eu/930/spatialResolutionAsScale"
+      "@id": "http://data.europa.eu/930/spatialResolutionAsDistance"
       }
     ],
     "http://www.w3.org/ns/dqv#value": [
       {
       "@type": "http://www.w3.org/2001/XMLSchema#decimal",
-      "@value": "0.000001"
+      "@value": "100"
       }
     ]
     },
@@ -104,7 +104,7 @@
     "@id": "https://some.catalogue/resource/a12345",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N0bcdac561ae047cb9a2077d808e072fb"
+      "@id": "_:Nf2231d4729dc4c3c8a52000b92ccd799"
       }
     ]
     },
@@ -112,11 +112,11 @@
     "@id": "https://some.catalogue/resource/b23456",
     "http://www.w3.org/ns/dqv#hasQualityMeasurement": [
       {
-      "@id": "_:N18fada498a4a436fa06fc3ae4489ccba"
+      "@id": "_:Nfa33069a4a7443318609c69475a60772"
       }
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/quality-measurement.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/quality-measurement.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/standard-crs.jsonld b/releases/examples/standard-crs.jsonld
index ad0b15a..7607adc 100644
--- a/releases/examples/standard-crs.jsonld
+++ b/releases/examples/standard-crs.jsonld
@@ -1,18 +1,6 @@
 [
   {
   "@graph": [
-    {
-    "@id": "http://www.opengis.net/def/crs/OGC",
-    "@type": [
-      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
-    ],
-    "http://purl.org/dc/terms/title": [
-      {
-      "@language": "en",
-      "@value": "OGC Coordinate Reference Systems"
-      }
-    ]
-    },
     {
     "@id": "http://www.opengis.net/def/crs/OGC/1.3/CRS84",
     "@type": [
@@ -46,8 +34,20 @@
       "@value": "CRS84"
       }
     ]
+    },
+    {
+    "@id": "http://www.opengis.net/def/crs/OGC",
+    "@type": [
+      "http://www.w3.org/2004/02/skos/core#ConceptScheme"
+    ],
+    "http://purl.org/dc/terms/title": [
+      {
+      "@language": "en",
+      "@value": "OGC Coordinate Reference Systems"
+      }
+    ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-crs.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-crs.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/standard-ir.jsonld b/releases/examples/standard-ir.jsonld
index cb2bdd1..9e69477 100644
--- a/releases/examples/standard-ir.jsonld
+++ b/releases/examples/standard-ir.jsonld
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-ir.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-ir.rdf"
   }
 ]
\ No newline at end of file
diff --git a/releases/examples/standard-md.jsonld b/releases/examples/standard-md.jsonld
index 6ff71f1..ec699e0 100644
--- a/releases/examples/standard-md.jsonld
+++ b/releases/examples/standard-md.jsonld
@@ -2,7 +2,7 @@
   {
   "@graph": [
     {
-    "@id": "_:N18ad7702a4e74d058a2e41063082d15c",
+    "@id": "_:Nfe59b8f29790426c98c9ca3a0a0646c1",
     "@type": [
       "http://purl.org/dc/terms/Standard"
     ],
@@ -20,6 +20,6 @@
     ]
     }
   ],
-  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.gh-pages/drafts/latest/examples/standard-md.rdf"
+  "@id": "file:///var/www/html/git/github/semiceu/GeoDCAT-AP.fix-issue-61/drafts/latest/examples/standard-md.rdf"
   }
 ]
\ No newline at end of file