diff --git a/kpi/wcmp2-kpi-DRAFT.docx b/kpi/wcmp2-kpi-DRAFT.docx
index c3ea2e0..fb1afad 100644
Binary files a/kpi/wcmp2-kpi-DRAFT.docx and b/kpi/wcmp2-kpi-DRAFT.docx differ
diff --git a/kpi/wcmp2-kpi-DRAFT.html b/kpi/wcmp2-kpi-DRAFT.html
index c9f29ec..7ff0578 100644
--- a/kpi/wcmp2-kpi-DRAFT.html
+++ b/kpi/wcmp2-kpi-DRAFT.html
@@ -454,10 +454,10 @@ <h1>WMO Core Metadata Profile 2, Key Performance Indicators</h1>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock"><strong class="big">World Meteorological Organization</strong></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-02-04</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-02-05</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0-DRAFT-2024-02-04</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0-DRAFT-2024-02-05</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Document location: <a href="https://community.wmo.int/wis-metadata-kpis" class="bare">https://community.wmo.int/wis-metadata-kpis</a></p></td>
@@ -1580,7 +1580,7 @@ <h3 id="_rules_7"><a class="anchor" href="#_rules_7"></a>2.8. Rules</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-02-04 17:52:53 UTC
+Last updated 2024-02-05 12:44:08 UTC
 </div>
 </div>
 </body>
diff --git a/kpi/wcmp2-kpi-DRAFT.pdf b/kpi/wcmp2-kpi-DRAFT.pdf
index d0c18a5..dcd5545 100644
Binary files a/kpi/wcmp2-kpi-DRAFT.pdf and b/kpi/wcmp2-kpi-DRAFT.pdf differ
diff --git a/standard/wcmp2-DRAFT.docx b/standard/wcmp2-DRAFT.docx
index 1153ad4..fe37794 100644
Binary files a/standard/wcmp2-DRAFT.docx and b/standard/wcmp2-DRAFT.docx differ
diff --git a/standard/wcmp2-DRAFT.html b/standard/wcmp2-DRAFT.html
index 0b4a80e..d4f2325 100644
--- a/standard/wcmp2-DRAFT.html
+++ b/standard/wcmp2-DRAFT.html
@@ -454,10 +454,10 @@ <h1>WMO Core Metadata Profile (WCMP) Version 2</h1>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock"><strong class="big">World Meteorological Organization</strong></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-02-04</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-02-05</p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0-DRAFT-2024-02-04</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0-DRAFT-2024-02-05</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Document location: TBD</p></td>
@@ -530,7 +530,7 @@ <h1>WMO Core Metadata Profile (WCMP) Version 2</h1>
 </li>
 <li><a href="#_the_wmo_core_metadata_profile_record">7. The WMO Core Metadata Profile Record</a>
 <ul class="sectlevel2">
-<li><a href="#_conformance_class_core">7.1. Conformance Class "Core"</a>
+<li><a href="#_requirements_class_core">7.1. Requirements Class "Core"</a>
 <ul class="sectlevel3">
 <li><a href="#_overview_2">7.1.1. Overview</a></li>
 <li><a href="#_validation">7.1.2. Validation</a></li>
@@ -562,7 +562,7 @@ <h1>WMO Core Metadata Profile (WCMP) Version 2</h1>
 </li>
 <li><a href="#_conformance_class_abstract_test_suite_normative">Annex A: Conformance Class Abstract Test Suite (Normative)</a>
 <ul class="sectlevel2">
-<li><a href="#_conformance_class_core_2">A.1. Conformance Class: Core</a>
+<li><a href="#_conformance_class_core">A.1. Conformance Class: Core</a>
 <ul class="sectlevel3">
 <li><a href="#_validation_2">A.1.1. Validation</a></li>
 <li><a href="#_identifier_2">A.1.2. Identifier</a></li>
@@ -691,15 +691,15 @@ <h2 id="_conformance"><a class="anchor" href="#_conformance"></a>2. Conformance<
 consistency across multiple metadata records and perform quality assessment and reporting.</p>
 </div>
 <div class="paragraph">
-<p>This standard identifies one Conformance Class which defines the functional requirements.</p>
+<p>This standard identifies one Requirements Class which defines the functional requirements.</p>
 </div>
 <div class="paragraph">
-<p>The mandatory Conformance Class for WCMP is:</p>
+<p>The mandatory Requirements Class for WCMP is:</p>
 </div>
 <div class="ulist">
 <ul>
 <li>
-<p>"WMO Core Metadata Profile Core": This conformance class inherits from <em>OGC API — Records — Part 1: Core:
+<p>"WMO Core Metadata Profile Core": This Requirements Class inherits from <em>OGC API — Records — Part 1: Core:
 Requirements Class: Record Core</em> which defines the requirements for a catalogue record.  The requirements
 specified in the Requirements Class “Record Core" are mandatory for all implementations of WMCP.
 The requirements are specified in Chapter 7 and in Annex A in more detail.</p>
@@ -1295,11 +1295,11 @@ <h2 id="_the_wmo_core_metadata_profile_record"><a class="anchor" href="#_the_wmo
 <p>A WCMP record provides descriptive information about a dataset made available through WIS2.</p>
 </div>
 <div class="sect2">
-<h3 id="_conformance_class_core"><a class="anchor" href="#_conformance_class_core"></a>7.1. Conformance Class "Core"</h3>
+<h3 id="_requirements_class_core"><a class="anchor" href="#_requirements_class_core"></a>7.1. Requirements Class "Core"</h3>
 <div class="sect3">
 <h4 id="_overview_2"><a class="anchor" href="#_overview_2"></a>7.1.1. Overview</h4>
 <div class="paragraph">
-<p>The WCMP Core Conformance Class provides requirements for a WCMP discovery metadata record.</p>
+<p>The WCMP Core Requirements Class provides requirements for a WCMP discovery metadata record.</p>
 </div>
 <table id="rc_core" class="tableblock frame-all grid-all" style="width: 90%;">
 <colgroup>
@@ -1311,7 +1311,7 @@ <h4 id="_overview_2"><a class="anchor" href="#_overview_2"></a>7.1.1. Overview</
 <td class="tableblock halign-left valign-top" colspan="2" style="background-color: #FFFFFF;"><p class="tableblock"><strong>Requirements Class</strong></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" colspan="2" style="background-color: #FFFFFF;"><p class="tableblock"><a href="http://wis.wmo.int/spec/wcmp/2/conf/core" class="bare">http://wis.wmo.int/spec/wcmp/2/conf/core</a></p></td>
+<td class="tableblock halign-left valign-top" colspan="2" style="background-color: #FFFFFF;"><p class="tableblock"><a href="http://wis.wmo.int/spec/wcmp/2/req/core" class="bare">http://wis.wmo.int/spec/wcmp/2/req/core</a></p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Target type</p></td>
@@ -3605,7 +3605,7 @@ <h3 id="_faceting"><a class="anchor" href="#_faceting"></a>8.1. Faceting</h3>
 <h2 id="_conformance_class_abstract_test_suite_normative"><a class="anchor" href="#_conformance_class_abstract_test_suite_normative"></a>Annex A: Conformance Class Abstract Test Suite (Normative)</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_conformance_class_core_2"><a class="anchor" href="#_conformance_class_core_2"></a>A.1. Conformance Class: Core</h3>
+<h3 id="_conformance_class_core"><a class="anchor" href="#_conformance_class_core"></a>A.1. Conformance Class: Core</h3>
 <div id="ats_core" class="exampleblock">
 <div class="content">
 <div class="dlist">
@@ -5877,7 +5877,7 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
                 ],
                 "links": [
                     {
-                        "rel": "canonical",
+                        "rel": "about",
                         "type": "text/html",
                         "href": "https://www.canada.ca/en/environment-climate-change.html"
                     }
@@ -5914,7 +5914,7 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
             "title": "Data access API interface"
         },
         {
-            "rel": "related",
+            "rel": "about",
             "href": "https://eccc-msc.github.io/open-data/msc-data/obs_station/readme_obs_insitu_swobdatamart_en",
             "type": "text/html",
             "title": "Documentation"
@@ -5922,7 +5922,7 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
         {
             "rel": "items",
             "href": "mqtts://example.org",
-            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/observations/surface-land/landFixed",
+            "channel": "origin/a/wis2/ca-eccc-msc/data/core/weather/surface-based-observations/synop",
             "type": "application/json",
             "title": "Data notifications"
         }
@@ -6133,7 +6133,7 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
         {
             "rel": "items",
             "channel": "origin/a/wis2/de-dwd/data/core/weather/prediction/forecast/medium-range",
-            "href": "mqtts://everyone:everyone@wis2.dwd.de:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "type": "application/json",
             "title": "Data notifications"
         }
@@ -6276,22 +6276,10 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
     },
     "links": [
         {
-            "rel": "data",
-            "type": "text/html",
-            "title": "WMO WIS Global Cache - Deutscher Wetterdienst (Cached files &lt; 24h during pilot)",
-            "href": "https://opendata.dwd.de/test/wis2/cache"
-        },
-        {
-            "rel": "archives",
-            "type": "text/html",
-            "title": "Open Data Server DWD (Metadata Archive)",
-            "href": "https://opendata.dwd.de/test/wis2/cache_metadata"
-        },
-        {
-            "rel": "related",
+            "rel": "items",
             "type": "application/json",
             "title": "WMO WIS2 Global Broker - M\u00e9t\u00e9o-France",
-            "href": "mqtts://everyone:everyone@globalbroker.meteo.fr:8883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "channel": "cache/a/wis2/#",
             "distribution": {
                 "maxMSGsize": 4096,
@@ -6302,7 +6290,7 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
             "rel": "related",
             "type": "application/json",
             "title": "WMO WIS Global Broker - China Meteorological Administration",
-            "href": "mqtt://everyone:everyone@gb.wis.cma.cn:1883",
+            "href": "mqtts://everyone:everyone@example.org:8883",
             "channel": "cache/a/wis2/#",
             "distribution": {
                 "maxMSGsize": 4096,
@@ -6511,7 +6499,7 @@ <h2 id="_revision_history"><a class="anchor" href="#_revision_history"></a>Annex
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-02-04 17:52:53 UTC
+Last updated 2024-02-05 12:44:08 UTC
 </div>
 </div>
 </body>
diff --git a/standard/wcmp2-DRAFT.pdf b/standard/wcmp2-DRAFT.pdf
index 575a257..b387d7d 100644
Binary files a/standard/wcmp2-DRAFT.pdf and b/standard/wcmp2-DRAFT.pdf differ