diff --git a/docs/index.html b/docs/index.html
index 8ad80063c..5fd2dab7f 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv=" Content-Type" content="text/html;charset=utf-8" />
 
     <script src="https://fastly.jsdelivr.net/npm/echarts@5/dist/echarts.min.js"></script>
-    
+
     <script
       src="https://www.w3.org/Tools/respec/respec-w3c"
       class="remove"
@@ -98,13 +98,19 @@
             url: 'https://github.com/brownoxford',
             company: 'mesur.io',
             companyURL: 'https://www.mesur.io/',
-          },       
+          },
           {
             name: 'Russell Hofvendahl',
             url: 'https://github.com/rhofvendahl',
             company: 'mesur.io',
             companyURL: 'https://www.mesur.io/',
-          },       
+          },
+          {
+            name: 'Vladimir Alexiev',
+            url: 'https://github.com/VladimirAlexiev/my',
+            company: 'Ontotext Corp',
+            companyURL: 'https://www.ontotext.com/',
+          },
         ],
         otherLinks: [
           {
@@ -206,32 +212,32 @@ <h2>Introduction</h2>
       <p>
         In streamlining operations and reacting to increasing expectations of market transparency and traceability,
         global supply chains are undergoing continuous digital transformation. At the same time, the surfaces
-        exposed to cyber attacks are increasing. These vulnerabilities of critical society infrastructure are 
-        recognized by governments around the world, clearly described in this US Presidential Order: 
+        exposed to cyber attacks are increasing. These vulnerabilities of critical society infrastructure are
+        recognized by governments around the world, clearly described in this US Presidential Order:
       </p>
 
       <p>
         <cite>
-          The private sector must adapt to the continuously changing threat environment, ensure its products are built and operate 
-          securely, and partner with governments to foster a more secure cyberspace.  In the end, the trust we place in 
-          our digital infrastructure should be proportional to [the trustworthiness and transparency of that infrastructure, and] to the 
+          The private sector must adapt to the continuously changing threat environment, ensure its products are built and operate
+          securely, and partner with governments to foster a more secure cyberspace.  In the end, the trust we place in
+          our digital infrastructure should be proportional to [the trustworthiness and transparency of that infrastructure, and] to the
           consequences [that may be incurred] if that trust is misplaced.
         </cite>
         <br/>
         Source: <a href="https://www.whitehouse.gov/briefing-room/presidential-actions/2021/05/12/executive-order-on-improving-the-nations-cybersecurity/">
           https://www.whitehouse.gov/briefing-room/presidential-actions/2021/05/12/executive-order-on-improving-the-nations-cybersecurity/</a>
       </p>
-      
+
       <p>
-        Similar recognition is seen in this Digital Strategy statement from the European Commission: 
+        Similar recognition is seen in this Digital Strategy statement from the European Commission:
       </p>
 
       <p>
         <cite>
-          The digital transformation of society [...] has expanded the threat landscape and is 
+          The digital transformation of society [...] has expanded the threat landscape and is
           bringing about new challenges, which require adapted and innovative responses.
-          Now any disruption, even one initially confined to one entity or one sector, can have [more broad, cascading effects], 
-          potentially resulting in far-reaching and long-lasting negative impacts in the delivery of services across the whole 
+          Now any disruption, even one initially confined to one entity or one sector, can have [more broad, cascading effects],
+          potentially resulting in far-reaching and long-lasting negative impacts in the delivery of services across the whole
           internal market.
         </cite>
         <br/>
@@ -239,13 +245,13 @@ <h2>Introduction</h2>
           https://digital-strategy.ec.europa.eu/en/library/proposal-directive-measures-high-common-level-cybersecurity-across-union</a>
       </p>
       <p>
-        The goal of this specification is to provide a path towards a secure digitized global supply chain. It does so by 
-        leveraging modern cryptography and web technology standards like the <a 
-        href="https://www.w3.org/TR/vc-data-model-2.0/">Verifiable Credential Data Model</a> (<a 
-        href="https://www.w3.org/TR/vc-data-model-2.0/">VCDM</a>), <a 
-        href="https://www.w3.org/TR/json-ld11/">JSON for Linked Data</a> (<a 
-        href="https://www.w3.org/TR/json-ld11/">JSON-LD</a>), and <a 
-        href="https://www.w3.org/TR/did-core/">Decentralized Identifiers</a> (<a 
+        The goal of this specification is to provide a path towards a secure digitized global supply chain. It does so by
+        leveraging modern cryptography and web technology standards like the <a
+        href="https://www.w3.org/TR/vc-data-model-2.0/">Verifiable Credential Data Model</a> (<a
+        href="https://www.w3.org/TR/vc-data-model-2.0/">VCDM</a>), <a
+        href="https://www.w3.org/TR/json-ld11/">JSON for Linked Data</a> (<a
+        href="https://www.w3.org/TR/json-ld11/">JSON-LD</a>), and <a
+        href="https://www.w3.org/TR/did-core/">Decentralized Identifiers</a> (<a
         href="https://www.w3.org/TR/did-core/">DIDs</a>).
       </p>
 
@@ -496,7 +502,7 @@ <h4>Open API</h4>
           >.
         </p>
       <p>
-      See <a href="https://w3id.org/traceability/interoperability">w3id.org/traceability/interoperability</a> 
+      See <a href="https://w3id.org/traceability/interoperability">w3id.org/traceability/interoperability</a>
       for REST API and interoperability tests associated with this vocabulary.
       </p>
       </section>
@@ -860,9 +866,9 @@ <h5>Supporting Documents</h5>
               <figcaption>Sample Air Waybill form</figcaption>
             </figure>
             <p>
-              A <a href="#IATAAirWaybillCredential">Waybill</a> is a transport 
-              document issued by the carrier. It serves a similar purpose as a 
-              Bill of Lading, except that it does not carry title. Instead, the 
+              A <a href="#IATAAirWaybillCredential">Waybill</a> is a transport
+              document issued by the carrier. It serves a similar purpose as a
+              Bill of Lading, except that it does not carry title. Instead, the
               consignee is identified on the document.
             </p>
           </dd>
@@ -877,7 +883,7 @@ <h5>Supporting Documents</h5>
               <figcaption>Sample Proforma Invoice form</figcaption>
             </figure>
             <p>
-              The <a href="#ProformaInvoiceCredential">Proforma Invoice</a> is a 
+              The <a href="#ProformaInvoiceCredential">Proforma Invoice</a> is a
               sample invoice provided by an exporter prior to a sale.
             </p>
           </dd>
@@ -908,9 +914,9 @@ <h5>Supporting Documents</h5>
               <figcaption>Sample Importer Security Filing form</figcaption>
             </figure>
             <p>
-              The <a href="#ImporterSecurityFilingCredential">Importer Security 
-              Filing</a>, commonly referred to as "10+2" is a requirement for 
-              import containerized cargo into the United States. 
+              The <a href="#ImporterSecurityFilingCredential">Importer Security
+              Filing</a>, commonly referred to as "10+2" is a requirement for
+              import containerized cargo into the United States.
             </p>
           </dd>
         </dl>
@@ -970,19 +976,19 @@ <h4>Traceable Presentation</h4>
         <section>
           <h4>Workflow</h4>
           <p>
-            <em>Workflows</em> enable correlation of multiple Traceable Presentations, made at different points in time and between different holders and verifiers. 
+            <em>Workflows</em> enable correlation of multiple Traceable Presentations, made at different points in time and between different holders and verifiers.
           </p>
           <p>
-            A <code>TraceablePresentation</code> MAY specify a <code>workflow</code>. 
+            A <code>TraceablePresentation</code> MAY specify a <code>workflow</code>.
           </p>
           <p>
-            A <code>workflow</code> MAY reference one or more <a href="https://w3id.org/traceability#workflow-definition>">WorkflowDefinitions</a> to indicate the intention of the presentation. 
+            A <code>workflow</code> MAY reference one or more <a href="https://w3id.org/traceability#workflow-definition>">WorkflowDefinitions</a> to indicate the intention of the presentation.
           </p>
           <p>
             A <code>workflow</code> MAY reference one or more <a href="https://w3id.org/traceability#workflow-instance>">WorkflowInstances</a> to correlate multiple <code>TraceablePresentations</code>.
           </p>
           <p>
-            When a Workflow references both Definition(s) and Instance(s), the Workflow Instance's progress <em>MAY</em> be tracked by comparing the credentials which have been presented within the Workflow Instance (numerator) against the combined set of credentials types required by the targeted Workflow Definitions (denominator). 
+            When a Workflow references both Definition(s) and Instance(s), the Workflow Instance's progress <em>MAY</em> be tracked by comparing the credentials which have been presented within the Workflow Instance (numerator) against the combined set of credentials types required by the targeted Workflow Definitions (denominator).
           </p>
 
         <section>
@@ -1001,31 +1007,31 @@ <h5>Workflow Definition</h5>
           </p>
 
           <p>
-            A Workflow Definition MUST be identified with an [[rfc3986]] conformant URI, 
+            A Workflow Definition MUST be identified with an [[rfc3986]] conformant URI,
             for example, <code>https://w3id.org/traceability#us-cbp-entry</code>.
           </p>
           <p>
-            By referencing a Workflow Definition `id` in a Traceable Presentation, the holder indicates 
+            By referencing a Workflow Definition `id` in a Traceable Presentation, the holder indicates
             to the verifier their intent to make the presentation.
           </p>
 
           <p>
-            The Workflow Definition <em>SHOULD</em> resolve to a manifest file describing 
+            The Workflow Definition <em>SHOULD</em> resolve to a manifest file describing
             the intent to complete the workflow, participating parties, and required credential types.
-            For example, <a href="https://w3id.org/traceability#us-cbp-entry">https://w3id.org/traceability#us-cbp-entry</a> 
+            For example, <a href="https://w3id.org/traceability#us-cbp-entry">https://w3id.org/traceability#us-cbp-entry</a>
             indicates that an Importer intends to import goods following common US CBP Entry filings.
           </p>
           <p class="note">
-            There are several systems for workflow definitions. See 
+            There are several systems for workflow definitions. See
             <a href="https://www.omg.org/spec/BPMN/2.0/About-BPMN/" target="_blank">BPMN</a>,
             <a href="https://en.wikipedia.org/wiki/YAWL" target="_blank">YAWL</a>, and/or
             <a href="https://docs.github.com/en/actions/using-workflows/about-workflows" target="_blank">GitHub Workflows</a>.
           </p>
 
-          <p>      
-            Multiple Workflow Definitions <em>MAY</em> be referenced by a Traceable Presentation, 
-            indicating that multiple relevant circumstances apply. 
-          </p>          
+          <p>
+            Multiple Workflow Definitions <em>MAY</em> be referenced by a Traceable Presentation,
+            indicating that multiple relevant circumstances apply.
+          </p>
 
           <p>
             We enable the grouping of all presentations related to a definition,
@@ -1047,7 +1053,7 @@ <h5>Workflow Definition</h5>
                   "workflow": {
                     // This refers to a Workflow Definition
                     "definition": [
-                      "https://w3id.org/traceability#us-cbp-entry" 
+                      "https://w3id.org/traceability#us-cbp-entry"
                     ],
                     "instance": [
                       "urn:uuid:f5fb6ce4-b0b1-41b8-89b0-331ni58b7ee0"
@@ -1088,23 +1094,23 @@ <h5>Workflow Instance</h5>
           <p>
             We refer to Workflow Instance's as an execution of a particular
             workflow, which may or may not be formally defined.
-          </p>          
+          </p>
           <p>
-            A Workflow Instance <em>MUST</em> be identified with a UUID v4 per [[rfc4122]], 
+            A Workflow Instance <em>MUST</em> be identified with a UUID v4 per [[rfc4122]],
             for example, <code>urn:uuid:f5fb6ce4-b0b1-41b8-89b0-331ni58b7ee0</code>.
           </p>
           <p>
-            By referencing the same Workflow Instance `id` in separate Traceable Presentations, 
-            the holder indicates to the verifier that the presentations are related. 
+            By referencing the same Workflow Instance `id` in separate Traceable Presentations,
+            the holder indicates to the verifier that the presentations are related.
           </p>
           <p>
-            For example, an initial presentation of an Intent to Import Credential may be followed at a 
-            later date by presentation of a Commercial Invoice Credential. The two presentations reference 
+            For example, an initial presentation of an Intent to Import Credential may be followed at a
+            later date by presentation of a Commercial Invoice Credential. The two presentations reference
             a common Workflow Instance identifier to indicate that they relate to the same shipment import.
           </p>
 
           <p class="note">
-            An example of a workflow definition is 
+            An example of a workflow definition is
             <a href="https://www.cbp.gov/trade/programs-administration/entry-summary/ace-process-and-policy">US Customs ACE Entry Summary Process</a>.
             Where specific instances are used to track cross border imports, it is important to be able to identify specific
             collections of documents associated with a given import.
@@ -1113,8 +1119,8 @@ <h5>Workflow Instance</h5>
           </p>
 
           <p>
-            The same Traceable Presentation <em>MAY</em> reference multiple Workflow Instances. 
-            This is a signal by the holder that the referenced Workflow Instances are the same and should be joined. 
+            The same Traceable Presentation <em>MAY</em> reference multiple Workflow Instances.
+            This is a signal by the holder that the referenced Workflow Instances are the same and should be joined.
           </p>
 
           <p>
@@ -1170,22 +1176,22 @@ <h5>Workflow Instance</h5>
         <section>
           <h4>Presentation Replacement</h4>
           <p>
-A holder MAY use the <code>replace</code> property of a <code>TraceablePresentation</code> 
+A holder MAY use the <code>replace</code> property of a <code>TraceablePresentation</code>
 to communciate to a verifier that a previous presentation should be replaced with a new presentation.
           </p>
           <p>
 Holders SHOULD ensure the previous presentation was accepted before presenting a <code>replace</code> presentation.
           </p>
           <p>
-The presentation <code>id</code> of the <code>replace</code> presentation MUST be unique, 
+The presentation <code>id</code> of the <code>replace</code> presentation MUST be unique,
 and MUST NOT be the same as any previously presented values.
           </p>
           <p>
-The credential <code>id</code> of any corrected credentials MUST be unique, 
+The credential <code>id</code> of any corrected credentials MUST be unique,
 and MUST NOT be the same as any previously presented values.
           </p>
           <p>
-In the example below <code>did:web:customs.broker.1.example</code> 
+In the example below <code>did:web:customs.broker.1.example</code>
 had made a mistake in a previous presentation, and corrects the mistake with a replace presentation.
           </p>
           <pre class="js">
@@ -1237,24 +1243,24 @@ <h4>Presentation Replacement</h4>
       <h2>Considerations</h2>
       <section class="informative">
         <h2>Privacy Considerations</h2>
-  
+
         <p>
           This section details the general privacy considerations and specific
           privacy implications of deploying this specification into production
           environments.
         </p>
       </section>
-  
+
       <section class="informative">
         <h2>Security Considerations</h2>
-  
+
         <p>
           There are a number of security considerations that implementers should
           be aware of when processing data described by this specification.
           Ignoring or not understanding the implications of this section can
           result in security vulnerabilities.
         </p>
-  
+
         <p>
           While this section attempts to highlight a broad set of security
           considerations, it is not a complete list. Implementers are urged to
@@ -1263,10 +1269,10 @@ <h2>Security Considerations</h2>
           this specification.
         </p>
       </section>
-  
+
       <section class="informative">
         <h2>Accessibility Considerations</h2>
-  
+
         <p>
           There are a number of accessibility considerations implementers should
           be aware of when processing data described in this specification. As
@@ -1278,16 +1284,16 @@ <h2>Accessibility Considerations</h2>
           establishing systems utilizing cryptography, which have historically
           created problems for assistive technologies.
         </p>
-  
+
         <p>
           This section details the general accessibility considerations to take
           into account when utilizing this data model.
         </p>
       </section>
-  
+
       <section class="informative">
         <h2>Internationalization Considerations</h2>
-  
+
         <p>
           There are a number of internationalization considerations implementers
           should be aware of when publishing data described in this specification.
@@ -1297,7 +1303,7 @@ <h2>Internationalization Considerations</h2>
           limit the applicability of the specification and significantly diminish
           its value as a standard.
         </p>
-  
+
         <p>
           This section outlines general internationalization considerations to
           take into account when utilizing this data model.
@@ -1305,7 +1311,7 @@ <h2>Internationalization Considerations</h2>
       </section>
     </section>
 
-    
+
 
     <section class="appendix">
       <h2>Appendix</h2>
@@ -1323,7 +1329,7 @@ <h2>Acknowledgements</h2>
       </section>
       <section>
         <h2>RDF Type Details</h2>
-  
+
         <section
         data-include="sections/ontology-visualizations.html"
         data-include-replace="true"
@@ -1332,7 +1338,7 @@ <h2>RDF Type Details</h2>
           data-include="sections/vocab.html"
           data-include-replace="true"
         ></section>
-  
+
         <section
         data-include="sections/test-suite.html"
         data-include-replace="true"
@@ -1347,17 +1353,17 @@ <h2>RDF Type Details</h2>
     crossorigin="anonymous"
     referrerpolicy="no-referrer"
   ></script>
- 
+
   <script type="module">
     import mermaid from 'https://cdn.jsdelivr.net/npm/mermaid@10.1.0/+esm'
     mermaid.initialize({ startOnLoad: false });
     async function tryRender() {
-      
+
       const pre = document.getElementsByClassName('mermaid');
       if(pre.length === 0) {
         return setTimeout(tryRender, 50);
       }
-      
+
       for(let i = 0; i < pre.length; i++) {
         const element = pre[i];
         const graphDefinition = element.textContent;
@@ -1369,7 +1375,7 @@ <h2>RDF Type Details</h2>
         image.src = url;
         element.appendChild(image);
       }
-      
+
     }
 
     tryRender();
diff --git a/docs/openapi/components/schemas/common/CBPEntry.yml b/docs/openapi/components/schemas/common/CBPEntry.yml
index 13579d614..aa8f7bbb6 100644
--- a/docs/openapi/components/schemas/common/CBPEntry.yml
+++ b/docs/openapi/components/schemas/common/CBPEntry.yml
@@ -2,7 +2,7 @@ $linkedData:
   term: CBPEntry
   '@id': https://w3id.org/traceability#CBPEntry
 title: CBP Entry
-description: CBP Form 3461 for Entry/Immediate Delivery (https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%20Form%203461%20-%20ACE%20Fillable.pdf and https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%203461%20Instructions_0.pdf).
+description: CBP Form 3461 for Entry/Immediate Delivery ([Fillable Form](https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%20Form%203461%20-%20ACE%20Fillable.pdf) and [Instructions](https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%203461%20Instructions_0.pdf)).
 type: object
 properties:
   type:
diff --git a/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml b/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
index cb9e0a005..fb7c7dd74 100644
--- a/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
+++ b/docs/openapi/components/schemas/credentials/CBP3461EntryCredential.yml
@@ -8,7 +8,7 @@ tags:
   - Agriculture
   - Oil and Gas
   - Other
-description: Customs and Border Protection Form 3461 Immediate Delivery Certification (https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%20Form%203461%20-%20ACE%20Fillable.pdf and https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%203461%20Instructions_0.pdf).
+description: Customs and Border Protection Form 3461 Immediate Delivery Certification  ([Fillable Form](https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%20Form%203461%20-%20ACE%20Fillable.pdf) and [Instructions](https://www.cbp.gov/sites/default/files/assets/documents/2016-Jun/CBP%203461%20Instructions_0.pdf)).
 type: object
 properties:
   '@context':
@@ -971,4 +971,4 @@ example: |-
       "conveyanceName": "Gizera",
       "arrivalDate": "2022-02-25"
     }
-  }
\ No newline at end of file
+  }