diff --git a/src/controllers/discoveryController.js b/src/controllers/discoveryController.js
index 0f9cf91..63737b9 100644
--- a/src/controllers/discoveryController.js
+++ b/src/controllers/discoveryController.js
@@ -21,7 +21,7 @@ export async function getDiscoveryMetadata(req, res) {
     });
 
     let md = {
-      "@context": ["https://apidg.gent.be/opendata/adlib2eventstream/v1/context/DCAT-AP-VL.jsonld", {
+      "@context": ["https://apidg.gent.be/opendata/adlib2eventstream/v1/context/DCAT-AP-VL-20.jsonld", {
         "dcterms": "http://purl.org/dc/terms/",
         "ldes": "https://w3id.org/ldes#",
         "tree": "https://w3id.org/tree#",
@@ -30,26 +30,32 @@ export async function getDiscoveryMetadata(req, res) {
         }
       }],
       "@id": baseURI + 'dcat/coghent',
-      "@type": "Datasetcatalogus",
-      "Datasetcatalogus.titel": {
+      "@type": "Catalogus",
+      "Catalogus.titel": {
         "@value": "Catalogus CoGhent",
         "@language": "nl"
       },
-      "Datasetcatalogus.beschrijving": {
+      "Catalogus.beschrijving": {
         "@value": "Catalogus van datasets voor de Collectie van de Gentenaar.",
         "@language": "nl"
       },
-      "Datasetcatalogus.heeftLicentie": {
-        "@id": "https://creativecommons.org/publicdomain/zero/1.0/"
+      "Catalogus.licentie": {
+        "@id": "https://data.vlaanderen.be/id/licentie/creative-commons-zero-verklaring/v1.0"
       },
-      "Datasetcatalogus.heeftUitgever": {
+      "Catalogus.uitgever": {
         "@id": "http://stad.gent/",
+        "@type": "dcterms:Agent",
         "Agent.naam": {
           "@value": "Stad Gent",
           "@language": "nl"
         }
       },
-      "Datasetcatalogus.heeftDataset": []
+      "Catalogus.contactinformatie": {
+        "@type": "Contactinfo",
+        "Contactinfo.eMail": "mailto:collectie@gent.be"
+      },
+      "Catalogus.identificator": baseURI + 'dcat/coghent',
+      "Catalogus.heeftDataset": []
     };
     const institutions = await db.models.Member.findAll(  {
       attributes: ['institution'],
@@ -91,7 +97,7 @@ export async function getDiscoveryMetadata(req, res) {
           };
         }
         const toegangsURL = config.eventstream.protocol + '://' + config.eventstream.hostname + port + '/' + path + institutions[i].institution + '/' + databases[d].adlibDatabase;
-        md["Datasetcatalogus.heeftDataset"].push({
+        md["Catalogus.heeftDataset"].push({
           "@id": baseURI + 'dataset/' + institutions[i].institution + '/' +  md5(institutions[i].institution + databases[d].adlibDatabase),
           "@type": ["Dataset", "ldes:EventStream"],
           "tree:view": toegangsURL,
@@ -103,10 +109,12 @@ export async function getDiscoveryMetadata(req, res) {
             "@value": "Event stream van de Adlib database '" + databases[d].adlibDatabase + "' van de instelling: " + institutionName,
             "@language": "nl"
           },
-          "Dataset.contactinfo": {
+          "Dataset.contactinformatie": {
             "@type": "Contactinfo",
             "Contactinfo.eMail": getEmailFromInstitutionName(institutionName)
           },
+          "Dataset.statuut": "https://metadata.vlaanderen.be/id/GDI-Vlaanderen-Trefwoorden/VLOPENDATASERVICE",
+          "Dataset.identificator": baseURI + 'dataset/' + institutions[i].institution + '/' +  md5(institutions[i].institution + databases[d].adlibDatabase),
           "Dataset.toegankelijkheid": "http://publications.europa.eu/resource/authority/access-right/PUBLIC",
           "Dataset.heeftUitgever": uitgevers,
           "heeftDistributie": {
@@ -128,10 +136,10 @@ export async function getDiscoveryMetadata(req, res) {
 }
 
 function getEmailFromInstitutionName(name) {
-  if (name === "Design Museum Gent") return 'data@designmuseumgent.be';
-  else if (name === "Archief Gent") return 'archief@stad.gent';
-  else if (name === "Huis van Alijn (Gent)") return 'info@huisvanalijn.be';
-  else if (name === "Industriemuseum") return 'bibliotheek@industriemuseum.be';
-  else if (name === "STAM (Gent)") return 'collectie.stam@stad.gent';
-  else return 'collectie@gent.be';
+  if (name === "Design Museum Gent") return 'mailto:data@designmuseumgent.be';
+  else if (name === "Archief Gent") return 'mailto:archief@stad.gent';
+  else if (name === "Huis van Alijn (Gent)") return 'mailto:info@huisvanalijn.be';
+  else if (name === "Industriemuseum") return 'mailto:bibliotheek@industriemuseum.be';
+  else if (name === "STAM (Gent)") return 'mailto:collectie.stam@stad.gent';
+  else return 'mailto:collectie@gent.be';
 }
diff --git a/src/public/context/DCAT-AP-VL-20.jsonld b/src/public/context/DCAT-AP-VL-20.jsonld
new file mode 100755
index 0000000..02f7ff7
--- /dev/null
+++ b/src/public/context/DCAT-AP-VL-20.jsonld
@@ -0,0 +1,462 @@
+{
+  "@context": {
+    "Agent": "http://purl.org/dc/terms/Agent",
+    "Agent.naam": {
+      "@container": "@set",
+      "@id": "http://xmlns.com/foaf/0.1/name",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Catalogus": "http://www.w3.org/ns/dcat#Catalog",
+    "Catalogus.alternatieveIdentificator": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#identifier",
+      "@type": "@id"
+    },
+    "Catalogus.beschrijving": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/description",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Catalogus.contactinformatie": {
+      "@id": "http://www.w3.org/ns/dcat#contactPoint",
+      "@type": "@id"
+    },
+    "Catalogus.heeftDataService": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#service",
+      "@type": "@id"
+    },
+    "Catalogus.heeftDataset": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#dataset",
+      "@type": "@id"
+    },
+    "Catalogus.identificator": {
+      "@id": "http://purl.org/dc/terms/identifier",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Catalogus.licentie": {
+      "@id": "http://purl.org/dc/terms/license",
+      "@type": "@id"
+    },
+    "Catalogus.record": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#record",
+      "@type": "@id"
+    },
+    "Catalogus.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Catalogus.uitgever": {
+      "@id": "http://purl.org/dc/terms/publisher",
+      "@type": "@id"
+    },
+    "CatalogusRecord": "http://www.w3.org/ns/dcat#CatalogRecord",
+    "CatalogusRecord.aanmaakdatum": {
+      "@id": "http://purl.org/dc/terms/issued",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "CatalogusRecord.alternatieveIdentificator": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#identifier",
+      "@type": "@id"
+    },
+    "CatalogusRecord.bronMetadataRecordLandingspagina": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#bronMetadataRecordLandingspagina",
+      "@type": "@id"
+    },
+    "CatalogusRecord.bronMetadatarecord": {
+      "@id": "http://purl.org/dc/terms/source",
+      "@type": "@id"
+    },
+    "CatalogusRecord.conform": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/conformsTo",
+      "@type": "@id"
+    },
+    "CatalogusRecord.hoofdonderwerp": {
+      "@id": "http://xmlns.com/foaf/0.1/primaryTopic",
+      "@type": "@id"
+    },
+    "CatalogusRecord.identificator": {
+      "@id": "http://purl.org/dc/terms/identifier",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "CatalogusRecord.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "CatalogusRecord.wijzigingsdatum": {
+      "@id": "http://purl.org/dc/terms/modified",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "CatalogusResource": "http://www.w3.org/ns/dcat#Resource",
+    "CatalogusResource.relatie": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/relation",
+      "@type": "@id"
+    },
+    "CatalogusResource.uitgever": {
+      "@id": "http://purl.org/dc/terms/publisher",
+      "@type": "@id"
+    },
+    "Contactinfo": "http://www.w3.org/2006/vcard/ns#Kind",
+    "Contactinfo.contactpagina": {
+      "@id": "http://xmlns.com/foaf/0.1/page",
+      "@type": "@id"
+    },
+    "Contactinfo.eMail": {
+      "@id": "http://www.w3.org/2006/vcard/ns#hasEmail",
+      "@type": "@id"
+    },
+    "Contactpunt": "http://schema.org/ContactPoint",
+    "Dataservice": "http://www.w3.org/ns/dcat#DataService",
+    "Dataservice.alternatieveIdentificator": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#identifier",
+      "@type": "@id"
+    },
+    "Dataservice.beschrijving": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/description",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataservice.biedtInformatieAanOver": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#servesdataset",
+      "@type": "@id"
+    },
+    "Dataservice.conformAanProtocol": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/conformsTo",
+      "@type": "@id"
+    },
+    "Dataservice.contactinformatie": {
+      "@id": "http://www.w3.org/ns/dcat#contactPoint",
+      "@type": "@id"
+    },
+    "Dataservice.creatiedatum": {
+      "@id": "http://purl.org/dc/terms/created",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Dataservice.endpointUrl": {
+      "@id": "http://www.w3.org/ns/dcat#endpointURL",
+      "@type": "@id"
+    },
+    "Dataservice.endpointbeschrijving": {
+      "@id": "http://www.w3.org/ns/dcat#endpointDescription",
+      "@type": "@id"
+    },
+    "Dataservice.identificator": {
+      "@id": "http://purl.org/dc/terms/identifier",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Dataservice.landingspagina": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#landingPage",
+      "@type": "@id"
+    },
+    "Dataservice.landingspaginaVoorAuthenticatie": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#landingspaginaVoorAuthenticatie",
+      "@type": "@id"
+    },
+    "Dataservice.landingspaginaVoorGebruiksinformatie": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#landingspaginaVoorGebruiksinformatie",
+      "@type": "@id"
+    },
+    "Dataservice.landingspaginaVoorStatusinformatie": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#landingspaginaVoorStatusinformatie",
+      "@type": "@id"
+    },
+    "Dataservice.levensfase": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#levensfase",
+      "@type": "@id"
+    },
+    "Dataservice.licentie": {
+      "@id": "http://purl.org/dc/terms/license",
+      "@type": "@id"
+    },
+    "Dataservice.ontwikkelingstoestand": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#ontwikkelingstoestand",
+      "@type": "@id"
+    },
+    "Dataservice.publicatiedatum": {
+      "@id": "http://purl.org/dc/terms/issued",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Dataservice.rechten": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/rights",
+      "@type": "@id"
+    },
+    "Dataservice.statuut": {
+      "@container": "@set",
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#statuut",
+      "@type": "@id"
+    },
+    "Dataservice.thema": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#theme",
+      "@type": "@id"
+    },
+    "Dataservice.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataservice.toegankelijkheid": {
+      "@id": "http://purl.org/dc/terms/accessRights",
+      "@type": "@id"
+    },
+    "Dataservice.trefwoord": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#keyword",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataservice.versie": {
+      "@id": "http://www.w3.org/2002/07/owl#versionInfo",
+      "@type": "http://www.w3.org/2001/XMLSchema#string"
+    },
+    "Dataservice.wijzigingsdatum": {
+      "@id": "http://purl.org/dc/terms/modified",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Dataset": "http://www.w3.org/ns/dcat#Dataset",
+    "Dataset.alternatieveIdentificator": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#identifier",
+      "@type": "@id"
+    },
+    "Dataset.beschrijving": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/description",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataset.conform": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/conformsTo",
+      "@type": "@id"
+    },
+    "Dataset.contactinformatie": {
+      "@id": "http://www.w3.org/ns/dcat#contactPoint",
+      "@type": "@id"
+    },
+    "Dataset.creatiedatum": {
+      "@id": "http://purl.org/dc/terms/created",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Dataset.distributie": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#distribution",
+      "@type": "@id"
+    },
+    "Dataset.eigenaar": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/rightsHolder",
+      "@type": "@id"
+    },
+    "Dataset.geografischeDekking": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/spatial",
+      "@type": "@id"
+    },
+    "Dataset.herkomst": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/provenance",
+      "@type": "@id"
+    },
+    "Dataset.identificator": {
+      "@id": "http://purl.org/dc/terms/identifier",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Dataset.landingspagina": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#landingPage",
+      "@type": "@id"
+    },
+    "Dataset.publicatiedatum": {
+      "@id": "http://purl.org/dc/terms/issued",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Dataset.statuut": {
+      "@container": "@set",
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#statuut",
+      "@type": "@id"
+    },
+    "Dataset.thema": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#theme",
+      "@type": "@id"
+    },
+    "Dataset.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataset.toegankelijkheid": {
+      "@id": "http://purl.org/dc/terms/accessRights",
+      "@type": "@id"
+    },
+    "Dataset.trefwoord": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#keyword",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Dataset.versie": {
+      "@id": "http://www.w3.org/2002/07/owl#versionInfo",
+      "@type": "http://www.w3.org/2001/XMLSchema#string"
+    },
+    "Dataset.voorbeeldweergave": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#sample",
+      "@type": "@id"
+    },
+    "Dataset.wijzigingsdatum": {
+      "@id": "http://purl.org/dc/terms/modified",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Distributie": "http://www.w3.org/ns/dcat#Distribution",
+    "Distributie.alternatieveIdentificator": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/adms#identifier",
+      "@type": "@id"
+    },
+    "Distributie.conform": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/conformsTo",
+      "@type": "@id"
+    },
+    "Distributie.downloadUrl": {
+      "@id": "http://www.w3.org/ns/dcat#downloadURL",
+      "@type": "@id"
+    },
+    "Distributie.formaat": {
+      "@id": "http://purl.org/dc/terms/format",
+      "@type": "@id"
+    },
+    "Distributie.identificator": {
+      "@id": "http://purl.org/dc/terms/identifier",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Distributie.licentie": {
+      "@id": "http://purl.org/dc/terms/license",
+      "@type": "@id"
+    },
+    "Distributie.rechten": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/rights",
+      "@type": "@id"
+    },
+    "Distributie.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Distributie.toegangsUrl": {
+      "@id": "http://www.w3.org/ns/dcat#accessURL",
+      "@type": "@id"
+    },
+    "Distributie.verdeler": {
+      "@id": "http://data.europa.eu/930/distributor",
+      "@type": "@id"
+    },
+    "Distributie.wordtAangebodenDoor": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#accessService",
+      "@type": "@id"
+    },
+    "HerkomstVerklaring": "http://purl.org/dc/terms/ProvenanceStatement",
+    "Identificator": "http://www.w3.org/ns/adms#Identifier",
+    "JuridischeBepaling": "http://purl.org/dc/terms/RightsStatement",
+    "LicentieDocument": "http://purl.org/dc/terms/LicenseDocument",
+    "Plaats": "http://purl.org/dc/terms/Location",
+    "Plaats.boundingBox": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#bbox",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Plaats.centroïde": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/dcat#centroid",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Plaats.geometrie": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/ns/locn#geometry",
+      "@type": "http://www.w3.org/2000/01/rdf-schema#Literal"
+    },
+    "Plaats.plaatsnaam": {
+      "@container": "@set",
+      "@id": "http://www.w3.org/2000/01/rdf-schema#label",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "RelatieQualificatie": "http://www.w3.org/ns/dcat#Relationship",
+    "RelatieQualificatie.catalogusResource(source)": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#RelatieQualificatie.catalogusResource.source",
+      "@type": "@id"
+    },
+    "RelatieQualificatie.catalogusResource(target)": {
+      "@id": "https://data.vlaanderen.be/ns/metadata-dcat#RelatieQualificatie.catalogusResource.target",
+      "@type": "@id"
+    },
+    "RelatieQualificatie.rol": {
+      "@id": "http://www.w3.org/ns/dcat#hadRole",
+      "@type": "@id"
+    },
+    "Standaard": "http://purl.org/dc/terms/Standard",
+    "Standaard.beschrijving": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/description",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Standaard.publicatiedatum": {
+      "@id": "http://purl.org/dc/terms/issued",
+      "@type": "http://www.w3.org/2001/XMLSchema#dateTime"
+    },
+    "Standaard.specificatieUrl": {
+      "@id": "http://www.w3.org/2000/01/rdf-schema#seeAlso",
+      "@type": "@id"
+    },
+    "Standaard.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Standaard.type": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/type",
+      "@type": "@id"
+    },
+    "Standaard.versie": {
+      "@id": "http://www.w3.org/2002/07/owl#versionInfo",
+      "@type": "http://www.w3.org/2001/XMLSchema#string"
+    },
+    "Standaard.voorkeurslabel": {
+      "@id": "http://www.w3.org/2004/02/skos/core#prefLabel",
+      "@type": "http://www.w3.org/2001/XMLSchema#string"
+    },
+    "Uri": "http://www.w3.org/2000/01/rdf-schema#Resource",
+    "Voorbeeldweergave": "http://www.w3.org/ns/dcat#Distribution",
+    "Voorbeeldweergave.beschrijving": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/description",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    },
+    "Voorbeeldweergave.downloadUrl": {
+      "@id": "http://www.w3.org/ns/dcat#downloadURL",
+      "@type": "@id"
+    },
+    "Voorbeeldweergave.mediatype": {
+      "@id": "http://www.w3.org/ns/dcat#mediatype",
+      "@type": "@id"
+    },
+    "Voorbeeldweergave.titel": {
+      "@container": "@set",
+      "@id": "http://purl.org/dc/terms/title",
+      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
+    }
+  }
+}
diff --git a/src/public/context/DCAT-AP-VL.jsonld b/src/public/context/DCAT-AP-VL.jsonld
deleted file mode 100755
index d160485..0000000
--- a/src/public/context/DCAT-AP-VL.jsonld
+++ /dev/null
@@ -1,89 +0,0 @@
-
-{
-  "@context": {
-    "Agent": "http://xmlns.com/foaf/0.1/Agent",
-    "Agent.naam": {
-      "@container": "@set",
-      "@id": "http://xmlns.com/foaf/0.1/name",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Contactinfo": "http://www.w3.org/2006/vcard/ns#Kind",
-    "Contactinfo.eMail": {
-      "@id": "http://www.w3.org/2006/vcard/ns#hasEmail",
-      "@type": "http://www.w3.org/2001/XMLSchema#anyURI"
-    },
-    "Dataset": "http://www.w3.org/ns/dcat#Dataset",
-    "Dataset.beschrijving": {
-      "@container": "@set",
-      "@id": "http://purl.org/dc/terms/description",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Dataset.contactinfo": {
-      "@container": "@set",
-      "@id": "http://www.w3.org/ns/dcat#contactPoint",
-      "@type": "@id"
-    },
-    "Dataset.heeftDistributie": {
-      "@container": "@set",
-      "@id": "http://www.w3.org/ns/dcat#distribution",
-      "@type": "@id"
-    },
-    "Dataset.heeftUitgever": {
-      "@id": "http://purl.org/dc/terms/publisher",
-      "@type": "@id"
-    },
-    "Dataset.thema": {
-      "@container": "@set",
-      "@id": "http://www.w3.org/ns/dcat#theme",
-      "@type": "@id"
-    },
-    "Dataset.titel": {
-      "@container": "@set",
-      "@id": "http://purl.org/dc/terms/title",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Dataset.toegankelijkheid": {
-      "@id": "http://purl.org/dc/terms/accessRights",
-      "@type": "@id"
-    },
-    "Datasetcatalogus": "http://www.w3.org/ns/dcat#Catalog",
-    "Datasetcatalogus.beschrijving": {
-      "@container": "@set",
-      "@id": "http://purl.org/dc/terms/description",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Datasetcatalogus.heeftDataset": {
-      "@container": "@set",
-      "@id": "http://www.w3.org/ns/dcat#dataset",
-      "@type": "@id"
-    },
-    "Datasetcatalogus.heeftLicentie": {
-      "@id": "http://purl.org/dc/terms/license",
-      "@type": "@id"
-    },
-    "Datasetcatalogus.heeftUitgever": {
-      "@id": "http://purl.org/dc/terms/publisher",
-      "@type": "@id"
-    },
-    "Datasetcatalogus.titel": {
-      "@container": "@set",
-      "@id": "http://purl.org/dc/terms/title",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Distributie": "http://www.w3.org/ns/dcat#Distribution",
-    "Distributie.heeftLicentie": {
-      "@id": "http://purl.org/dc/terms/license",
-      "@type": "@id"
-    },
-    "Distributie.titel": {
-      "@container": "@set",
-      "@id": "http://purl.org/dc/terms/title",
-      "@type": "http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"
-    },
-    "Distributie.toegangsUrl": {
-      "@id": "http://www.w3.org/ns/dcat#accessURL",
-      "@type": "http://www.w3.org/2001/XMLSchema#anyURI"
-    },
-    "Licentiedocument": "http://purl.org/dc/terms/LicenseDocument"
-  }
-}
\ No newline at end of file
diff --git a/src/routes/all.js b/src/routes/all.js
index 6fc2c1b..47d3012 100644
--- a/src/routes/all.js
+++ b/src/routes/all.js
@@ -31,7 +31,7 @@ router.get("/status/am-i-up", statusAmIUp);
 router.get("/status/db", statusDb);
 
 router.get("/:institution/:adlibDatabase", getEventstream);
-router.get('/id/datasetcatalogus/:ref', (_req, res) => res.redirect(baseURI));
+router.get('/id/catalogus/:ref', (_req, res) => res.redirect(baseURI));
 router.get('/:institution/id/dataset/:ref', (_req, res) => res.redirect(baseURI));
 
 export default router;
diff --git a/src/swagger.json b/src/swagger.json
index 8a73e38..fd7c4c5 100644
--- a/src/swagger.json
+++ b/src/swagger.json
@@ -43,7 +43,7 @@
           "@type": {
             "type": "string"
           },
-          "Datasetcatalogus.title": {
+          "Catalogus.title": {
             "type": "object",
             "properties": {
               "@value": {
@@ -54,7 +54,7 @@
               }
             }
           },
-          "Datasetcatalogus.beschrijving": {
+          "Catalogus.beschrijving": {
             "type": "object",
             "properties": {
               "@value": {
@@ -65,7 +65,7 @@
               }
             }
           },
-          "Datasetcatalogus.heeftLicentie":{
+          "Catalogus.heeftLicentie":{
             "type": "object",
             "properties": {
               "@id": {
@@ -73,12 +73,16 @@
               }
             }
           },
-          "Datasetcatalogus.heeftUitgever": {
+          "Catalogus.heeftUitgever": {
             "type": "object",
             "properties": {
               "@id": {
                 "type": "string"
               },
+              "@type": {
+                "type": "string",
+                "const": "dcterms:Agent"
+              },
               "Agent.naam": {
                 "type": "object",
                 "properties": {
@@ -92,7 +96,7 @@
               }
             }
           },
-          "Datasetcatalogus.heeftDataSet": {
+          "Catalogus.heeftDataSet": {
             "type": "array",
             "items": {
               "$ref": "#/components/schemas/Dataset"
@@ -137,13 +141,13 @@
               }
             }
           },
-          "Dataset.contactinfo": {
+          "Dataset.contactPoint": {
             "type": "object",
             "properties": {
               "@type": {
                 "type": "string"
               },
-              "Contactinfo.eMail": {
+              "contactPoint.eMail": {
                 "type": "string"
               }
             }