diff --git a/data-models/untp-dfr/artefacts/FacilityRecord-instance.json b/data-models/untp-dfr/artefacts/FacilityRecord-instance.json
index 6c5629ed..a3aa55d6 100644
--- a/data-models/untp-dfr/artefacts/FacilityRecord-instance.json
+++ b/data-models/untp-dfr/artefacts/FacilityRecord-instance.json
@@ -273,15 +273,13 @@
           "accuracy": 0.05
         }
       ],
-      "conformance": true,
       "conformityTopic": "environment.emissions",
       "conformityEvidence": {
         "linkURL": "https://files.example-certifier.com/1234567.json",
         "linkName": "GBA rule book conformity certificate",
         "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
         "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
-        "hashMethod": "SHA-256",
-        "encryptionMethod": "AES"
+        "hashMethod": "SHA-256"
       }
     },
     {
@@ -449,15 +447,13 @@
           "accuracy": 0.05
         }
       ],
-      "conformance": true,
       "conformityTopic": "environment.emissions",
       "conformityEvidence": {
         "linkURL": "https://files.example-certifier.com/1234567.json",
         "linkName": "GBA rule book conformity certificate",
         "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
         "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
-        "hashMethod": "SHA-256",
-        "encryptionMethod": "AES"
+        "hashMethod": "SHA-256"
       }
     }
   ]
diff --git a/data-models/untp-dfr/artefacts/FacilityRecord-schema.json b/data-models/untp-dfr/artefacts/FacilityRecord-schema.json
index e82efa76..7a5f4756 100644
--- a/data-models/untp-dfr/artefacts/FacilityRecord-schema.json
+++ b/data-models/untp-dfr/artefacts/FacilityRecord-schema.json
@@ -526,11 +526,6 @@
           },
           "description": "The list of specific values measured as part of this assessment (eg tensile strength)"
         },
-        "conformance": {
-          "example": true,
-          "type": "boolean",
-          "description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria."
-        },
         "conformityTopic": {
           "type": "string",
           "enum": [
@@ -561,7 +556,6 @@
       "description": "A declaration of conformance with one or more criteria from a specific standard or regulation.  ",
       "required": [
         "id",
-        "conformance",
         "conformityTopic"
       ]
     },
@@ -967,15 +961,6 @@
           ],
           "example": "SHA-256",
           "description": "The hashing algorithm used to create the target hash.  SHA-265 is the recommended standard"
-        },
-        "encryptionMethod": {
-          "type": "string",
-          "enum": [
-            "none",
-            "AES"
-          ],
-          "example": "none",
-          "description": "The symmetric encryption algorithm used to encrypt the link target.  AES is the recommended standard. Decryption keys are expected to be passed out of bounds."
         }
       },
       "description": "A binary file that is hashed ()for tamper evidence) and optionally encrypted (for confidentiality)."
diff --git a/data-models/untp-dfr/artefacts/context.jsonld b/data-models/untp-dfr/artefacts/context.jsonld
index 16a0eea6..efe3dbc2 100644
--- a/data-models/untp-dfr/artefacts/context.jsonld
+++ b/data-models/untp-dfr/artefacts/context.jsonld
@@ -1,8 +1,8 @@
 {
   "@context": {
-    "untp-dfr": "https://test.uncefact.org/vocabulary/untp/dfr/0/",
-    "schemaorg": "https://schema.org/",
-    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/",
+    "untp-dfr": "https://test.uncefact.org/vocabulary/untp/dfr/working/",
+    "schema": "https://schema.org/",
+    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/",
     "geojson": "https://purl.org/geojson/vocab#",
     "renderMethodPrefix": "https://w3id.org/vc/render-method#",
     "xsd": "http://www.w3.org/2001/XMLSchema#",
@@ -18,7 +18,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         }
       }
     },
@@ -32,7 +32,7 @@
           "@type": "xsd:string"
         },
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "schemeID": {
           "@id": "untp-core:schemeID",
@@ -50,7 +50,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "registeredId": {
           "@id": "untp-core:registeredId",
@@ -61,7 +61,7 @@
           "@type": "@id"
         },
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "registrationCountry": {
           "@id": "untp-core:registrationCountry",
@@ -85,7 +85,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -105,7 +105,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "issuerAlsoKnownAs": {
           "@id": "untp-core:Party",
@@ -113,7 +113,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -133,7 +133,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "registeredId": {
           "@id": "untp-core:registeredId",
@@ -144,7 +144,7 @@
           "@type": "@id"
         },
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "countryOfOperation": {
           "@id": "untp-core:countryOfOperation",
@@ -164,7 +164,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -182,7 +182,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -295,7 +295,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "issuingParty": {
           "@id": "untp-core:Party",
@@ -303,7 +303,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -327,7 +327,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "jurisdictionCountry": {
           "@id": "untp-core:jurisdictionCountry",
@@ -343,7 +343,7 @@
           "@context": {
             "@protected": true,
             "name": {
-              "@id": "schemaorg:name"
+              "@id": "schema:name"
             },
             "registeredId": {
               "@id": "untp-core:registeredId",
@@ -367,17 +367,17 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "conformityTopic": {
           "@id": "untp-core:conformityTopic",
           "@type": "@vocab",
           "@context": {
             "@protected": true,
-            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
+            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
           }
         },
         "status": {
@@ -385,7 +385,7 @@
           "@type": "@vocab",
           "@context": {
             "@protected": true,
-            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/statusCode#"
+            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/statusCode#"
           }
         },
         "subCriterion": {
@@ -450,7 +450,7 @@
       "@context": {
         "@protected": true,
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "referenceStandard": {
           "@id": "untp-core:referenceStandard",
@@ -506,16 +506,12 @@
             }
           }
         },
-        "conformance": {
-          "@id": "untp-core:conformance",
-          "@type": "xsd:boolean"
-        },
         "conformityTopic": {
           "@id": "untp-core:conformityTopic",
           "@type": "@vocab",
           "@context": {
             "@protected": true,
-            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
+            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
           }
         },
         "conformityEvidence": {
@@ -544,15 +540,7 @@
               "@type": "@vocab",
               "@context": {
                 "@protected": true,
-                "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/hashMethodCode#"
-              }
-            },
-            "encryptionMethod": {
-              "@id": "untp-core:encryptionMethod",
-              "@type": "@vocab",
-              "@context": {
-                "@protected": true,
-                "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/encryptionMethodCode#"
+                "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/hashMethodCode#"
               }
             }
           }
@@ -580,7 +568,7 @@
       "@context": {
         "@protected": true,
         "description": {
-          "@id": "schemaorg:description"
+          "@id": "schema:description"
         },
         "referenceStandard": {
           "@id": "untp-core:referenceStandard",
@@ -636,16 +624,12 @@
             }
           }
         },
-        "conformance": {
-          "@id": "untp-core:conformance",
-          "@type": "xsd:boolean"
-        },
         "conformityTopic": {
           "@id": "untp-core:conformityTopic",
           "@type": "@vocab",
           "@context": {
             "@protected": true,
-            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/0/conformityTopicCode#"
+            "@vocab": "https://test.uncefact.org/vocabulary/untp/core/working/conformityTopicCode#"
           }
         }
       }
@@ -656,7 +640,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "mediaQuery": {
           "@id": "untp-core:mediaQuery",
@@ -678,7 +662,7 @@
       "@context": {
         "@protected": true,
         "name": {
-          "@id": "schemaorg:name"
+          "@id": "schema:name"
         },
         "template": {
           "@id": "renderMethodPrefix:template",
diff --git a/data-models/untp-dfr/artefacts/untp-dfr-instance.json b/data-models/untp-dfr/artefacts/untp-dfr-instance.json
index bfa967f4..8050d95a 100644
--- a/data-models/untp-dfr/artefacts/untp-dfr-instance.json
+++ b/data-models/untp-dfr/artefacts/untp-dfr-instance.json
@@ -5,7 +5,7 @@
   ],
   "@context": [
     "https://www.w3.org/ns/credentials/v2",
-    "https://test.uncefact.org/vocabulary/untp/dfr/0.6.1/"
+    "https://test.uncefact.org/vocabulary/untp/dfr/working/"
   ],
   "id": "https://example-company.com/credentials/2a423366-a0d6-4855-ba65-2e0c926d09b0",
   "issuer": {
@@ -318,15 +318,13 @@
             "accuracy": 0.05
           }
         ],
-        "conformance": true,
         "conformityTopic": "environment.emissions",
         "conformityEvidence": {
           "linkURL": "https://files.example-certifier.com/1234567.json",
           "linkName": "GBA rule book conformity certificate",
           "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
           "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
-          "hashMethod": "SHA-256",
-          "encryptionMethod": "AES"
+          "hashMethod": "SHA-256"
         }
       },
       {
@@ -494,15 +492,13 @@
             "accuracy": 0.05
           }
         ],
-        "conformance": true,
         "conformityTopic": "environment.emissions",
         "conformityEvidence": {
           "linkURL": "https://files.example-certifier.com/1234567.json",
           "linkName": "GBA rule book conformity certificate",
           "linkType": "https://test.uncefact.org/vocabulary/linkTypes/dcc",
           "hashDigest": "6239119dda5bd4c8a6ffb832fe16feaa5c27b7dba154d24c53d4470a2c69adc2",
-          "hashMethod": "SHA-256",
-          "encryptionMethod": "AES"
+          "hashMethod": "SHA-256"
         }
       }
     ]
diff --git a/data-models/untp-dfr/artefacts/untp-dfr-schema.json b/data-models/untp-dfr/artefacts/untp-dfr-schema.json
index 89170bf3..5cadd862 100644
--- a/data-models/untp-dfr/artefacts/untp-dfr-schema.json
+++ b/data-models/untp-dfr/artefacts/untp-dfr-schema.json
@@ -31,7 +31,7 @@
     "@context": {
       "example": [
         "https://www.w3.org/ns/credentials/v2",
-        "https://test.uncefact.org/vocabulary/untp/dfr/0.6.1/"
+        "https://test.uncefact.org/vocabulary/untp/dfr/working/"
       ],
       "type": "array",
       "items": {
@@ -45,13 +45,13 @@
           "type": "string"
         },
         {
-          "const": "https://test.uncefact.org/vocabulary/untp/dfr/0.6.1/",
+          "const": "https://test.uncefact.org/vocabulary/untp/dfr/working/",
           "type": "string"
         }
       ],
       "default": [
         "https://www.w3.org/ns/credentials/v2",
-        "https://test.uncefact.org/vocabulary/untp/dfr/0.6.1/"
+        "https://test.uncefact.org/vocabulary/untp/dfr/working/"
       ],
       "minItems": 2,
       "uniqueItems": true
@@ -688,11 +688,6 @@
           },
           "description": "The list of specific values measured as part of this assessment (eg tensile strength)"
         },
-        "conformance": {
-          "example": true,
-          "type": "boolean",
-          "description": "An indicator of whether or not the claim or assesment conforms to the regulatory or standard criteria."
-        },
         "conformityTopic": {
           "type": "string",
           "enum": [
@@ -723,7 +718,6 @@
       "description": "A declaration of conformance with one or more criteria from a specific standard or regulation.  ",
       "required": [
         "id",
-        "conformance",
         "conformityTopic"
       ]
     },
@@ -1129,15 +1123,6 @@
           ],
           "example": "SHA-256",
           "description": "The hashing algorithm used to create the target hash.  SHA-265 is the recommended standard"
-        },
-        "encryptionMethod": {
-          "type": "string",
-          "enum": [
-            "none",
-            "AES"
-          ],
-          "example": "none",
-          "description": "The symmetric encryption algorithm used to encrypt the link target.  AES is the recommended standard. Decryption keys are expected to be passed out of bounds."
         }
       },
       "description": "A binary file that is hashed ()for tamper evidence) and optionally encrypted (for confidentiality)."
diff --git a/data-models/untp-dfr/vocabulary.jsonld b/data-models/untp-dfr/vocabulary.jsonld
index da25aa1e..c5ecd983 100644
--- a/data-models/untp-dfr/vocabulary.jsonld
+++ b/data-models/untp-dfr/vocabulary.jsonld
@@ -1,12 +1,12 @@
 {
   "@context": {
-    "untp-dfr": "https://test.uncefact.org/vocabulary/untp/dfr/0/",
+    "untp-dfr": "https://test.uncefact.org/vocabulary/untp/dfr/working/",
     "xsd": "http://www.w3.org/2001/XMLSchema#",
     "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
     "owl": "http://www.w3.org/2002/07/owl#",
     "rdfs": "http://www.w3.org/2000/01/rdf-schema#",
     "schema": "https://schema.org/",
-    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/0/"
+    "untp-core": "https://test.uncefact.org/vocabulary/untp/core/working/"
   },
   "@graph": [
     {
@@ -96,11 +96,11 @@
     {
       "@id": "untp-dfr:name",
       "schema:rangeIncludes": {
-        "@id": "xsd:string"
+        "@id": "schema:name"
       },
       "@type": [
         "rdf:Property",
-        "owl:DatatypeProperty"
+        "owl:ObjectProperty"
       ],
       "schema:domainIncludes": [
         {