diff --git a/index.html b/index.html
index b68febe1..a0861c44 100644
--- a/index.html
+++ b/index.html
@@ -1514,7 +1514,7 @@ <h4>Creation</h4>
                             Creation refers to the registration of a new <a>TD</a> inside the directory.
                         </p>
                         <p> 
-                            The TD object is validated in accordance with [[[#validation]]].
+                            The TD object is validated in accordance with [[[#exploration-directory-api-things-validation]]].
                             Note that a TD may or may not be generated by the <a>Thing</a> it describes.
                             For brownfield devices in particular a separate <a>Discoverer</a> process
                             or service may be required that generates and registers a TD for a <a>Thing</a>
@@ -1536,7 +1536,7 @@ <h4>Creation</h4>
                                 <span class="rfc2119-assertion" id="tdd-things-create-known-contenttype">
                                     The request SHOULD contain `application/td+json` Content-Type header for 
                                     JSON serialization of TD.</span>
-                                The TD object is validated in accordance with [[[#validation]]].
+                                The TD object is validated in accordance with [[[#exploration-directory-api-things-validation]]].
                                 <span class="rfc2119-assertion" id="tdd-things-create-known-td-resp">  
                                     Upon successful processing, the server MUST respond with
                                     201 (Created) status.</span>
@@ -1558,7 +1558,7 @@ <h4>Creation</h4>
                                 <span class="rfc2119-assertion" id="tdd-things-create-anonymous-contenttype">
                                     The request SHOULD contain `application/td+json` Content-Type header for 
                                     JSON serialization of TD.</span>
-                                The TD object is validated in accordance with [[[#validation]]].
+                                The TD object is validated in accordance with [[[#exploration-directory-api-things-validation]]].
                                 <span class="rfc2119-assertion" id="tdd-things-create-anonymous-td-resp">
                                     Upon successful processing, the server MUST respond with 201 (Created) status
                                     and a Location header containing a system-generated identifier for the TD.</span>
@@ -1719,7 +1719,7 @@ <h4>Update</h4>
                                 <span class="rfc2119-assertion" id="tdd-things-update-contenttype">
                                     The request SHOULD contain `application/td+json` Content-Type header for JSON
                                     serialization of TD.</span>
-                                The TD object is validated in accordance with [[[#validation]]].
+                                The TD object is validated in accordance with [[[#exploration-directory-api-things-validation]]].
                                 <span class="rfc2119-assertion" id="tdd-things-update-resp">
                                     Upon success, the server MUST respond with 204 (No Content) status.</span>
 
@@ -1763,7 +1763,7 @@ <h4>Update</h4>
                                 but appear in the original TD, that member is removed. 
                                 Members with object values are processed recursively.
                                 
-                                After applying the modifications, the TD object is validated in accordance with [[[#validation]]].
+                                After applying the modifications, the TD object is validated in accordance with [[[#exploration-directory-api-things-validation]]].
                                 <span class="rfc2119-assertion" id="tdd-things-update-partial-resp">
                                     Upon success, the server MUST respond with a 204 (No Content) status.</span>
 
@@ -2033,16 +2033,22 @@ <h4>Listing</h4>
                         
                     </section>
 
-                    <section id="validation" class="normative">
+                    <section id="exploration-directory-api-things-validation" class="normative">
                         <h4>Validation</h4>
                         <p>
                            <span class="rfc2119-assertion" id="tdd-validation-syntactic">
                                 The syntactic validation of TD objects before storage is RECOMMENDED to
                                 prevent common erroneous submissions.</span>
+    
                             <span class="rfc2119-assertion" id="tdd-validation-jsonschema">
-                                The server MAY use
-                                <a href="https://www.w3.org/TR/wot-thing-description/#json-schema-for-validation">Thing Description JSON Schema</a>
-                                to validate standard TD vocabulary, or a more comprehensive JSON Schema to also validate extensions.</span>
+				The server SHOULD use at least 
+				<a href="https://www.w3.org/TR/wot-thing-description11/#minimal-validation-serialization-json">Minimal Validation</a> 
+				as defined in [[wot-thing-description11]]
+                                to validate TDs, including use of the
+				<a href="https://www.w3.org/TR/wot-thing-description/#json-schema-for-validation">WoT Thing Description (1.0) JSON Schema</a> or
+                                <a href="https://www.w3.org/TR/wot-thing-description11/#json-schema-for-validation">WoT Thing Description 1.1 JSON Schema</a>,
+				and the JSON schema defined in [[[#tdd-extensions-jsonschema]]] for <a>Enriched TDs</a>,
+				as appropriate based on the value of the <code>@context</code>.</span>
                         </p>
                         <p>
                             Additional forms of validation can be added to support various use cases.
@@ -2092,10 +2098,6 @@ <h4>Validation</h4>
                                 due to the current lack of WoT-specific error types.
                             </p>
                         </aside>
-                        
-                        
-
-                        <div class="issue" data-number="99"></div>
                     </section>
 
                 </section>
@@ -2401,9 +2403,8 @@ <h4>API Specification (Thing Model)</h1>
                     given in this Thing Model
                     are not normative and are provided for information only.
                     </p>
-                    <pre class="advisement json">
-                        <div data-include='directory.tm.json'></div>
-                    </pre>
+                    <pre class="advisement json"
+                         data-include='directory.tm.json'></pre>
 
                     <p class="issue" data-number="82">
                         Need to confirm if equivalent OpenAPI spec can be easily created out of the TM.
@@ -2964,6 +2965,15 @@ <h2>CoRE Resource Types Registration</h2>
 
         </section>
     </section>
+
+    <section id="tdd-extensions-jsonschema" class="appendix">
+        <h1>JSON Schema for WoT Discovery TD-extensions</h1>
+        The following JSON Schema specifies the extensions used in <a>Enriched TDs</a>.
+        It can be used for validating <a>TDs</a> by a <a>TDD</a>
+        as prescribed in [[[#exploration-directory-api-things-validation]]].
+        <pre class="advisement json"
+             data-include='validation/td-discovery-extensions-json-schema.json'></pre>
+    </section>
     
     <section id="changes" class="appendix">
       <h1>Recent Specification Changes</h1>