diff --git a/input/fsh/requirements/requirements.fsh b/input/fsh/requirements/requirements.fsh
index 87192d7c03d..d13b7dcf534 100644
--- a/input/fsh/requirements/requirements.fsh
+++ b/input/fsh/requirements/requirements.fsh
@@ -23,10 +23,12 @@ Usage: #definition
 * actor[+] = Canonical(Issuer)
 * statement[+].key = "IssuerVDHC-generate"
 * statement[=].label = "Generate Verifiable Digital Health Certificate"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "Generate the content that will be signed as part of a Verifiable Digital Health Certificate"
 * statement[=].conformance = #SHALL
 * statement[+].key = "IssuerVDHC-sign"
 * statement[=].label = "Sign Verifiable Digital Health Certificate"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "Sign content to produce a Verifiable Digital Health Certificate."
 * statement[=].conformance = #SHALL
 
@@ -67,22 +69,27 @@ Usage: #definition
 * actor[+] = Canonical(Receiver)
 * statement[+].key = "UtilizeVDHC-reveive"
 * statement[=].label = "Ingest VDHC"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "A user of a Receiver system receives a Verfiable Digital Health Certificate from a Holder. The user ingests the Verifiable Digital Health Certificate into the Receiver system.  The means of conveyance and how the Verifiable Digital Health Certificate is rendered is depedent on the use context."
 * statement[=].conformance = #SHALL
 * statement[+].key = "UtilizeVDHC-retreive-keys"
 * statement[=].label = "Retrieve matching keys"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "Retrieve and/or filter from an apporopriate PKI material distribution endpoint the set of public keys that match the key identifier (kid), trust domain code, participant code, and/or key usage code as applicable to the context of use of the Verfiable Digital Health Certificate."
 * statement[=].conformance = #SHALL
 * statement[+].key = "UtilizeVDHC-validate-hash"
 * statement[=].label = "Compute Hash"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "As appropriate  to the content type of the Verfiable Digtial Health Certificate, compute the hash of the content, and use the retrieved public keys(s) to try to verify the signature against the hashed value."
 * statement[=].conformance = #SHALL
 * statement[+].key = "UtilizeVDHC-display-verified-content"
 * statement[=].label = "Display verified content"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "Display verified cotent to the user of the Reciever system."
 * statement[=].conformance = #SHALL
 * statement[+].key = "UtilizeVDHC-execute-business-rule"
 * statement[=].label = "Execute business rules"
+* statement[=].conformance = #SHALL
 * statement[=].requirement = "Execute zero or more business rules against the Verifiable Digital Health Certificate that was provided by a Holder.  Results of the execution of the business rules are displayed to the user of the Receiver system."
 * statement[=].conformance = #SHALL
 
diff --git a/input/images/tng-additional-context/v1 b/input/images/tng-additional-context/v1
deleted file mode 100644
index 9e5a8c874db..00000000000
--- a/input/images/tng-additional-context/v1
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "@context": {
-    "@protected": true,
-    "id": "@id",
-    "type": "@type",
-    "participant": {
-      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-DEV",
-      "@type": "@vocab"
-    },
-    "keyusage": {
-      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-DEV",
-      "@type": "@vocab"
-    },
-    "domain": {
-      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domain-DEV",
-      "@type": "@vocab"
-    },
-    "kid": {
-      "@id": "https://tools.ietf.org/rfc/rfc7517#section-4.5",
-      "@type": "https://www.w3.org/2001/XMLSchema#string"
-    },
-    "JsonWebKey2020": {
-      "@id": "https://w3id.org/security#JsonWebKey2020",
-      "@context": {
-        "@protected": true,
-        "id": "@id",
-        "type": "@type",
-        "publicKeyJwk": {
-          "@id": "https://w3id.org/security#publicKeyJwk",
-          "@type": "@json",
-          "@context": {
-            "kid": {
-              "@id": "https://tools.ietf.org/rfc/rfc7517#section-4.5",
-              "@type": "https://www.w3.org/2001/XMLSchema#string"
-            }
-          }
-        },
-        "participant": {
-          "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-DEV",
-          "@type": "@vocab"
-        },
-        "keyusage": {
-          "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-DEV",
-          "@type": "@vocab"
-        },
-        "domain": {
-          "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domain-DEV",
-          "@type": "@vocab"
-        }
-      }
-    }
-  }
-}
diff --git a/input/images/tng-context/v1-DEV.jsonld b/input/images/tng-context/v1-DEV.jsonld
new file mode 100644
index 00000000000..5a711ca4dd5
--- /dev/null
+++ b/input/images/tng-context/v1-DEV.jsonld
@@ -0,0 +1,41 @@
+{
+    "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "proof": "https://w3id.org/security#proof",
+        "domain": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains-DEV.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains-DEV.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        },
+        "participant": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-DEV.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-DEV.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        },
+        "keyusage": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-DEV.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-DEV.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/input/images/tng-context/v1-UAT.jsonld b/input/images/tng-context/v1-UAT.jsonld
new file mode 100644
index 00000000000..eec439723a4
--- /dev/null
+++ b/input/images/tng-context/v1-UAT.jsonld
@@ -0,0 +1,41 @@
+{
+    "@context": {
+        "@version": 1.1,
+        "id": "@id",
+        "type": "@type",
+        "proof": "https://w3id.org/security#proof",
+        "domain": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains-UAT.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains-UAT.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        },
+        "participant": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-UAT.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants-UAT.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        },
+        "keyusage": {
+            "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-UAT.jsonld",
+            "@type": "@id",
+            "@context": {
+                "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage-UAT.jsonld#",
+                "code": {
+                    "@id": "@id",
+                    "@type": "@id"
+                }
+            }
+        }
+    }
+}
diff --git a/input/images/tng-context/v1.jsonld b/input/images/tng-context/v1.jsonld
new file mode 100644
index 00000000000..1e20b6e2fcd
--- /dev/null
+++ b/input/images/tng-context/v1.jsonld
@@ -0,0 +1,41 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "id": "@id",
+    "type": "@type",
+    "proof": "https://w3id.org/security#proof",
+    "domain": {
+      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains.jsonld",
+      "@type": "@id",
+      "@context": {
+        "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Domains.jsonld#",
+        "code": {
+          "@id": "@id",
+          "@type": "@id"
+        }
+      }
+    },
+    "participant": {
+      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants.jsonld",
+      "@type": "@id",
+      "@context": {
+        "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-Participants.jsonld#",
+        "code": {
+          "@id": "@id",
+          "@type": "@id"
+        }
+      }
+    },
+    "keyusage": {
+      "@id": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage.jsonld",
+      "@type": "@id",
+      "@context": {
+        "@base": "https://worldhealthorganization.github.io/smart-trust/ValueSet-KeyUsage.jsonld#",
+        "code": {
+          "@id": "@id",
+          "@type": "@id"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file