diff --git a/sys/context/kbv.jsonld b/sys/context/kbv.jsonld
index 79268578..e7135498 100644
--- a/sys/context/kbv.jsonld
+++ b/sys/context/kbv.jsonld
@@ -31,7 +31,6 @@
     "acquisitionTerms": {"@container": "@set"},
     "additionalClassificationDdc": {"@container": "@set"},
     "address": {"@container": "@set"},
-    "altLabel": {"@container": "@set"},
     "appliedMaterial": {"@container": "@set"},
     "arrangement": {"@container": "@set"},
     "associatedLanguage": {"@container": "@set"},
@@ -50,7 +49,6 @@
     "cartographicAttributes": {"@container": "@set"},
     "cataloguersNote": {"@container": "@set"},
     "category": {"@container": "@set"},
-    "changeNote": {},
     "citationSource": {"@container": "@set"},
     "classification": {"@container": "@set"},
     "datasetClass": {
@@ -73,7 +71,6 @@
     "codedLocationQualifier": {"@container": "@set"},
     "collectionOrganization": {"@container": "@set"},
     "colorContent": {"@container": "@set"},
-    "comment": {"@container": "@set"},
     "concerning": {"@container": "@set"},
     "contentAccessibility": {"@container": "@set"},
     "contentType": {"@container": "@set"},
@@ -87,7 +84,6 @@
     "copyrightArticleFeeCode": {"@container": "@set"},
     "dataSource": {"@container": "@set"},
     "date": {"@container": "@set"},
-    "definition": {},
     "depiction": {"@container": "@set"},
     "describedBy": {"@container": "@set"},
     "description": {},
@@ -97,9 +93,7 @@
     "digitalCharacteristic": {"@container": "@set"},
     "dissertation": {"@container": "@set"},
     "distribution": {"@container": "@set"},
-    "editionStatement": {"@container": "@set"},
     "editionStatementRemainder": {"@container": "@set"},
-    "editorialNote": {"@container": "@set"},
     "electronicLocator": {"@container": "@set"},
     "exactMatch": {"@container": "@set"},
     "extent": {"@container": "@set"},
@@ -131,8 +125,6 @@
     "hasTypeOfFamily": {"@container": "@set"},
     "hasVariant": {"@container": "@set"},
     "hasVersion": {"@container": "@set"},
-    "hiddenLabel": {"@container": "@set"},
-    "historyNote": {"@container": "@set"},
     "identifiedBy": {"@container": "@set"},
     "image": {"@container": "@set"},
     "immediateAcquisition": {"@container": "@set"},
@@ -148,7 +140,6 @@
     "isPartOf": {"@container": "@set"},
     "isPrimaryTopicOf": {"@container": "@set"},
     "issuedWith": {"@container": "@set"},
-    "label": {"@container": "@set"},
     "language": {"@container": "@set"},
     "layout": {"@container": "@set"},
     "legalDate": {"@container": "@set"},
@@ -164,21 +155,17 @@
     "narrower": {"@container": "@set"},
     "nationality": {"@container": "@set"},
     "nonCodedLocationQualifier": {"@container": "@set"},
-    "note": {"@container": "@set"},
     "numeration": {"@container": "@set"},
     "organizationalUnit": {"@container": "@set"},
     "otherEdition": {"@container": "@set"},
     "otherPhysicalFormat": {"@container": "@set"},
     "part": {"@container": "@set"},
-    "partName": {"@container": "@set"},
-    "partNumber": {"@container": "@set"},
     "pattern": {"@container": "@set"},
     "physicalLocation": {"@container": "@set"},
     "place": {"@container": "@set"},
     "polarity": {"@container": "@set"},
     "precededBy": {"@container": "@set"},
     "precededInPartBy": {"@container": "@set"},
-    "prefLabel": {},
     "production": {"@container": "@set"},
     "productionMethod": {"@container": "@set"},
     "projectionCharacteristic": {"@container": "@set"},
@@ -196,10 +183,8 @@
     "replaces": {"@container": "@set"},
     "role": {"@container": "@set"},
     "sameAs": {"@container": "@set"},
-    "scopeNote": {"@container": "@set"},
     "separatedFrom": {"@container": "@set"},
     "seriesMembership": {"@container": "@set"},
-    "seriesStatement": {"@container": "@set"},
     "soundCharacteristic": {"@container": "@set"},
     "source": {"@container": "@set"},
     "sourceConsulted": {"@container": "@set"},
@@ -214,7 +199,6 @@
     "systemRequirement": {"@container": "@set"},
     "tableOfContents": {"@container": "@set"},
     "technicalNote": {"@container": "@set"},
-    "title": {},
     "translation": {"@container": "@set"},
     "translationOf": {"@container": "@set"},
     "treatySigningDate": {"@container": "@set"},
@@ -224,6 +208,21 @@
     "usageAndAccessPolicy": {"@container": "@set"},
     "videoCharacteristic": {"@container": "@set"},
 
+    "label": {"@container": "@set", "@language": null},
+    "comment": {"@container": "@set", "@language": null},
+    "prefLabel": {"@language": null},
+    "altLabel": {"@container": "@set", "@language": null},
+    "hiddenLabel": {"@container": "@set", "@language": null},
+    "note": {"@container": "@set", "@language": null},
+    "definition": {"@language": null},
+    "example": {"@container": "@set", "@language": null},
+    "scopeNote": {"@container": "@set", "@language": null},
+    "editorialNote": {"@container": "@set", "@language": null},
+    "changeNote": {"@container": "@set", "@language": null},
+    "historyNote": {"@container": "@set", "@language": null},
+    "title": {"@language": null},
+    "alternative": {"@language": null},
+
     "bulk": "https://id.kb.se/ns/bulk/",
     "bulk:status": {"@type": "@vocab"},
     "bulk:hasId": { "@container": "@set"},
diff --git a/sys/context/shared.jsonld b/sys/context/shared.jsonld
index 2f3f0203..ba7fb327 100644
--- a/sys/context/shared.jsonld
+++ b/sys/context/shared.jsonld
@@ -56,31 +56,50 @@
     "prefLabelByLang": {"@id": "prefLabel", "@container": "@language"},
     "altLabelByLang": {"@id": "altLabel", "@container": "@language"},
     "hiddenLabelByLang": {"@id": "hiddenLabel", "@container": "@language"},
-    "singularLabelByLang": {"@id": "singularLabel", "@container": "@language"},
-    "pluralLabelByLang": {"@id": "pluralLabel", "@container": "@language"},
-    "searchLabelByLang": {"@id": "searchLabel", "@container": "@language"},
     "noteByLang": {"@id": "note", "@container": "@language"},
     "definitionByLang": {"@id": "definition", "@container": "@language"},
+    "exampleByLang": {"@id": "example", "@container": "@language"},
     "scopeNoteByLang": {"@id": "scopeNote", "@container": "@language"},
     "editorialNoteByLang": {"@id": "editorialNote", "@container": "@language"},
     "changeNoteByLang": {"@id": "changeNote", "@container": "@language"},
     "historyNoteByLang": {"@id": "historyNote", "@container": "@language"},
     "titleByLang": {"@id": "title", "@container": "@language"},
+    "alternativeByLang": {"@id": "alternative", "@container": "@language"},
     "descriptionByLang": {"@id": "description", "@container": "@language"},
 
+    "singularLabel": {"@language": null},
+    "singularLabelByLang": {"@id": "singularLabel", "@container": "@language"},
+    "pluralLabel": {"@language": null},
+    "pluralLabelByLang": {"@id": "pluralLabel", "@container": "@language"},
+    "searchLabel": {"@language": null},
+    "searchLabelByLang": {"@id": "searchLabel", "@container": "@language"},
+
+    "mainTitle": {"@language": null},
     "mainTitleByLang": {"@id": "mainTitle", "@container": "@language"},
+    "subtitle": {"@language": null},
     "subtitleByLang": {"@id": "subtitle", "@container": "@language"},
+    "titleRemainder": {"@language": null},
     "titleRemainderByLang": {"@id": "titleRemainder", "@container": "@language"},
+    "partNumber": {"@container": "@set", "@language": null},
     "partNumberByLang": {"@id": "partNumber", "@container": "@language"},
+    "partName": {"@container": "@set", "@language": null},
     "partNameByLang": {"@id": "partName", "@container": "@language"},
+    "responsibilityStatement": {"@language": null},
     "responsibilityStatementByLang": {"@id": "responsibilityStatement", "@container": "@language"},
+    "editionStatement": {"@container": "@set", "@language": null},
     "editionStatementByLang": {"@id": "editionStatement", "@container": "@language"},
+    "seriesStatement": {"@container": "@set", "@language": null},
     "seriesStatementByLang": {"@id": "seriesStatement", "@container": "@language"},
+    "seriesEnumeration": {"@language": null},
     "seriesEnumerationByLang": {"@id": "seriesEnumeration", "@container": "@language"},
 
+    "familyName": {"@language": null},
     "familyNameByLang": {"@id": "familyName", "@container": "@language"},
+    "givenName": {"@language": null},
     "givenNameByLang": {"@id": "givenName", "@container": "@language"},
+    "name": {"@language": null},
     "nameByLang": {"@id": "name", "@container": "@language"},
+    "lifeSpan": {"@language": null},
     "lifeSpanByLang": {"@id": "lifeSpan", "@container": "@language"},
 
     "labelHTML": {"@id": "label", "@type": "rdf:HTML"},