diff --git a/ogc/bblocks/metadata-schema.yaml b/ogc/bblocks/metadata-schema.yaml
index a89c88c..a2f8bdd 100644
--- a/ogc/bblocks/metadata-schema.yaml
+++ b/ogc/bblocks/metadata-schema.yaml
@@ -220,3 +220,10 @@ properties:
       Whether this Building Block should be "highlighted" or "featured" within the register, potentially
       used as an entry point for the collection
     type: boolean
+  conformanceClasses:
+    description: |
+      List of conformance classes (URIs) that this building block refers to.
+    type: array
+    items:
+      type: string
+      pattern: '^https?://.*'
diff --git a/ogc/bblocks/register-context.yaml b/ogc/bblocks/register-context.yaml
index c3417bf..7a5401e 100644
--- a/ogc/bblocks/register-context.yaml
+++ b/ogc/bblocks/register-context.yaml
@@ -10,7 +10,8 @@ transform:
         "hasConcepts": .
       } else . + {
         "@type": ["skos:ConceptScheme", "dcat:Catalog"],
-        "skos:prefLabel": .name,
+        "name": "Building Blocks - \(.name)",
+        "skos:prefLabel": "Building Blocks - \(.name)",
         "hasConcepts": .bblocks
       } | del(.bblocks) end
   - '{ "@context": { "@base": ($baseUrl // "https://www.opengis.net/def/bblocks/") } } + .'
@@ -25,6 +26,7 @@ context:
     xsd: http://www.w3.org/2001/XMLSchema#
     prof: http://www.w3.org/ns/dx/prof/
     dcat: http://www.w3.org/ns/dcat#
+    modspec: http://www.opengis.net/def/ont/modspec/
 
     itemIdentifier: '@id'
     baseURL: '@id'
@@ -97,3 +99,6 @@ context:
     imports:
       '@id': bblocks:imports
       '@type': '@id'
+    conformanceClasses:
+      '@id': modspec:class
+      '@type': '@id'
\ No newline at end of file