diff --git a/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.html b/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.html
index 2d40ff8b9..bfa3184c7 100644
--- a/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.html
+++ b/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.html
@@ -119,7 +119,7 @@ <h4 id="editors">Editors:</h4>
 <h4 id="additional-artifacts"><a name="AdditionalArtifacts">Additional artifacts:</a></h4>
 <p>This prose specification is one component of a Work Product that also includes:</p>
 <ul>
-<li>XML schemas: (list file names or directory name)</li>
+<li>XML schemas: <em>OData EDMX XML Schema and OData EDM XML Schema</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/</a></li>
 <li>Other parts (list titles and/or file names)</li>
 <li><code>(Note: Any normative computer language definitions that are part of the Work Product, such as XML instances, schemas and Java(TM) code, including fragments of such, must be (a) well formed and valid, (b) provided in separate plain text files, (c) referenced from the Work Product; and (d) where any definition in these separate files disagrees with the definition found in the specification, the definition in the separate file prevails. Remove this note before submitting for publication.)</code></li>
 </ul>
@@ -132,9 +132,13 @@ <h4 id="related-work"><a name="RelatedWork">Related work:</a></h4>
 <ul>
 <li><em>OData Version 4.02</em>. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
 <ul>
-<li><em>OData Version 4.02 Part 1: Protocol</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html</a></li>
-<li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
+<li><em>OData Version 4.02 Part 1: Protocol</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html</a></li>
+<li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
+<li><em>ABNF components: OData ABNF Construction Rules Version 4.01 and OData ABNF Test Cases</em>. <a href="https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/">https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/</a></li>
 </ul></li>
+<li><em>OData Vocabularies Version 4.0</em>. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html">https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html</a></li>
+<li><em>OData Common Schema Definition Language (CSDL) XML Representation Version 4.01</em>. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html</a></li>
+<li><em>OData JSON Format Version 4.01</em>. Edited by Ralf Handl, Mike Pizzo, and Mark Biamonte. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html">https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html</a></li>
 </ul>
 <h4 id="abstract">Abstract:</h4>
 <p>OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.</p>
@@ -198,6 +202,11 @@ <h1 id="table-of-contents">Table of Contents</h1>
 <li><a href="#IncludedSchema">4.2 Included Schema</a></li>
 <li><a href="#IncludedAnnotations">4.3 Included Annotations</a></li>
 </ul></li>
+<li><a href="#Schema">5 Schema</a>
+<ul>
+<li><a href="#Alias">5.1 Alias</a></li>
+<li><a href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a></li>
+</ul></li>
 <li><a href="#References">A References</a>
 <ul>
 <li><a href="#NormativeReferences">A.1 Normative References</a></li>
@@ -300,7 +309,7 @@ <h2 id="22-design-considerations"><a name="DesignConsiderations" href="#DesignCo
 <p>To further reduce size the member <code>$Kind</code> is optional for <a href="#StructuralProperty">structural properties</a> as these are more common than <a href="#NavigationProperty">navigation properties</a>, and the member <a href="#Type"><code>$Type</code></a> is optional for string properties, parameters, and return types, as this type is more common than other primitive types.</p>
 <p>In general, all members that have a default value SHOULD be omitted if they have the default value.</p>
 <h2 id="23-json-schema-definition"><a name="JSONSchemaDefinition" href="#JSONSchemaDefinition">2.3 JSON Schema Definition</a></h2>
-<p>The structure of CSDL JSON documents can be verified with the JSON Schema <a href="#CSDLschema">OData-CSDL-Schema</a> provided as an additional artifact of this prose specification. This schema only defines the shape of a well-formed CSDL JSON document but is not descriptive enough to define what a correct CSDL JSON document MUST be in every imaginable use case. This specification document defines additional rules that correct CSDL JSON documents MUST fulfill. In case of doubt on what makes a CSDL JSON document correct the rules defined in this specification document take precedence.</p>
+<p>The structure of CSDL JSON documents can be verified with the JSON Schema <a href="#ODataCSDL">OData-CSDL-Schema</a> provided as an additional artifact of this prose specification. This schema only defines the shape of a well-formed CSDL JSON document but is not descriptive enough to define what a correct CSDL JSON document MUST be in every imaginable use case. This specification document defines additional rules that correct CSDL JSON documents MUST fulfill. In case of doubt on what makes a CSDL JSON document correct the rules defined in this specification document take precedence.</p>
 <h1 id="3-entity-model"><a name="EntityModel" href="#EntityModel">3 Entity Model</a></h1>
 <p>An OData service exposes a single entity model. This model may be distributed over several <a href="#Schema">schemas</a>, and these schemas may be distributed over several documents.</p>
 <p>A service is defined by a single CSDL document which can be accessed by sending a <code>GET</code> request to <code>&lt;serviceRoot&gt;/$metadata</code>. This document is called the metadata document. It MAY <a href="#Reference">reference</a> other CSDL documents.</p>
@@ -460,7 +469,7 @@ <h2 id="33-primitive-types"><a name="PrimitiveTypes" href="#PrimitiveTypes">3.3
 </tr>
 </tbody>
 </table>
-<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XMLSchema">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
+<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XMLSchema2">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
 <p><code>Edm.Decimal with a </code><a href="#Scale"><code>Scale</code></a><code> value of floating</code>, <code>Edm.Double</code>, and <code>Edm.Single</code> allow the special numeric values <code>-INF</code>, <code>INF</code>, and <code>NaN</code>.</p>
 <p><code>Edm.Stream</code> is a primitive type that can be used as a property of an <a href="#EntityType">entity type</a> or <a href="#ComplexType">complex type</a>, the underlying type for a <a href="#TypeDefinition">type definition</a>, or the binding parameter or return type of an <a href="#Action">action</a> or <a href="#Function">function</a>. <code>Edm.Stream</code>, or a type definition whose underlying type is <code>Edm.Stream</code>, cannot be used in collections or for non-binding parameters to functions or actions.</p>
 <p>Some of these types allow <a href="#TypeFacets">facets</a>, defined in section "<a href="#TypeFacets">Type Facets</a>".</p>
@@ -680,6 +689,54 @@ <h3 id="-targetnamespace"><a name="TargetNamespace2.7" href="#TargetNamespace2.7
 </ul>
 </div>
 <hr />
+<h1 id="5-schema"><a name="Schema" href="#Schema">5 Schema</a></h1>
+<p>One or more schemas describe the entity model exposed by an OData service. The schema acts as a namespace for elements of the entity model such as entity types, complex types, enumerations and terms.</p>
+<p>A schema is identified by a <a href="#Namespace">namespace</a>. Schema namespaces MUST be unique within the scope of a document and SHOULD be globally unique. A schema cannot span more than one document.</p>
+<p>The schema's namespace is combined with the name of elements in the schema to create unique <a href="#QualifiedName">qualified names</a>, so identifiers that are used to name types MUST be unique within a namespace to prevent ambiguity.</p>
+<p>Names are case-sensitive, but service authors SHOULD NOT choose names that differ only in case.</p>
+<p>The namespace MUST NOT be one of the reserved values <code>Edm</code>, <code>odata</code>, <code>System</code>, or <code>Transient</code>.</p>
+<section id="-schema-object" class="varjson rep">
+<h3><a name="SchemaObject3" href="#SchemaObject3"> Schema Object</a></h3>
+<p>A schema is represented as a member of the document object whose name is the schema namespace. Its value is an object that MAY contain the members <a href="#Alias"><code>$Alias</code></a> and <a href="#AnnotationswithExternalTargeting"><code>$Annotations</code></a>.</p>
+<p>The schema object MAY contain members representing <a href="#EntityType">entity types</a>, <a href="#ComplexType">complex types</a>, <a href="#EnumerationType">enumeration types</a>, <a href="#TypeDefinition">type definitions</a>, <a href="#Action">actions</a>, <a href="#Function">functions</a>, <a href="#Term">terms</a>, and an <a href="#EntityContainer">entity container</a>.</p>
+<p>The schema object MAY also contain <a href="#Annotation">annotations</a> that apply to the schema itself.</p>
+</section>
+<h2 id="51-alias"><a name="Alias" href="#Alias">5.1 Alias</a></h2>
+<p>A schema MAY specify an alias which MUST be a <a href="#SimpleIdentifier">simple identifier</a>.</p>
+<div class="varjson">
+<p>If a schema specifies an alias, the alias MUST be used instead of the namespace within qualified names throughout the document to identify model elements of that schema. A mixed use of namespace-qualified names and alias-qualified names is not allowed.</p>
+</div>
+<p>Aliases are document-global, so all schemas defined within or included into a document MUST have different aliases, and aliases MUST differ from the namespaces of all schemas defined within or included into a document. Aliases defined by a schema can be used throughout the containing document and are not restricted to the schema that defines them.</p>
+<p>The alias MUST NOT be one of the reserved values <code>Edm</code>, <code>odata</code>, <code>System</code>, or <code>Transient</code>.</p>
+<section id="-alias-1" class="varjson rep">
+<h3><a name="Alias3.1" href="#Alias3.1"> <code>$Alias</code></a></h3>
+<p>The value of <code>$Alias</code> is a string containing the alias for the schema.</p>
+</section>
+<div class="varjson example">
+<p>Example 6: document defining a schema <code>org.example</code> with an alias and a description for the schema</p>
+<div class="sourceCode" id="cb7"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="fu">{</span></span>
+<span id="cb7-2"><a href="#cb7-2" aria-hidden="true" tabindex="-1"></a><span class="er"> </span> <span class="er">...</span></span>
+<span id="cb7-3"><a href="#cb7-3" aria-hidden="true" tabindex="-1"></a><span class="er"> </span> <span class="dt">&quot;org.example&quot;</span><span class="fu">:</span> <span class="fu">{</span></span>
+<span id="cb7-4"><a href="#cb7-4" aria-hidden="true" tabindex="-1"></a><span class="er">   </span> <span class="dt">&quot;$Alias&quot;</span><span class="fu">:</span> <span class="st">&quot;self&quot;</span><span class="fu">,</span> <span class="er">   </span> <span class="dt">&quot;@Core.Description&quot;</span><span class="fu">:</span> <span class="st">&quot;Example schema&quot;</span><span class="fu">,</span></span>
+<span id="cb7-5"><a href="#cb7-5" aria-hidden="true" tabindex="-1"></a><span class="er">   </span> <span class="er">...</span> <span class="er"> </span> <span class="fu">},</span></span>
+<span id="cb7-6"><a href="#cb7-6" aria-hidden="true" tabindex="-1"></a><span class="er"> </span> <span class="er">...</span> <span class="fu">}</span></span></code></pre></div>
+</div>
+<h2 id="52-annotations-with-external-targeting"><a name="AnnotationswithExternalTargeting" href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a></h2>
+<section id="-annotations" class="varjson rep">
+<h3><a name="Annotations3.2" href="#Annotations3.2"> <code>$Annotations</code></a></h3>
+<p>The value of <code>$Annotations</code> is an object with one member per <a href="#Target">annotation target</a>. The member name is a path identifying the <a href="#Target">annotation target</a>, the member value is an object containing <a href="#Annotation">annotations</a> for that target.</p>
+</section>
+<div class="varjson example">
+<p>Example 7: annotations targeting the <code>Person</code> type with qualifier <code>Tablet</code></p>
+<div class="sourceCode" id="cb8"><pre class="sourceCode json"><code class="sourceCode json"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="er">&quot;org.example&quot;:</span> <span class="fu">{</span></span>
+<span id="cb8-2"><a href="#cb8-2" aria-hidden="true" tabindex="-1"></a><span class="er"> </span> <span class="dt">&quot;$Alias&quot;</span><span class="fu">:</span> <span class="st">&quot;self&quot;</span><span class="fu">,</span> <span class="er">  </span><span class="dt">&quot;$Annotations&quot;</span><span class="fu">:</span> <span class="fu">{</span></span>
+<span id="cb8-3"><a href="#cb8-3" aria-hidden="true" tabindex="-1"></a><span class="er">   </span> <span class="dt">&quot;self.Person&quot;</span><span class="fu">:</span> <span class="fu">{</span></span>
+<span id="cb8-4"><a href="#cb8-4" aria-hidden="true" tabindex="-1"></a><span class="er">     </span> <span class="dt">&quot;@Core.Description#Tablet&quot;</span><span class="fu">:</span> <span class="st">&quot;Dummy&quot;</span><span class="fu">,</span></span>
+<span id="cb8-5"><a href="#cb8-5" aria-hidden="true" tabindex="-1"></a><span class="er">     </span> <span class="er">...</span></span>
+<span id="cb8-6"><a href="#cb8-6" aria-hidden="true" tabindex="-1"></a><span class="er">   </span> <span class="fu">}</span></span>
+<span id="cb8-7"><a href="#cb8-7" aria-hidden="true" tabindex="-1"></a><span class="er"> </span> <span class="fu">}</span> <span class="fu">}</span><span class="er">,</span></span></code></pre></div>
+</div>
+<hr />
 <h1 id="appendix-a-references"><a name="References" href="#References">Appendix A. References</a></h1>
 <!-- Required section -->
 
@@ -687,7 +744,6 @@ <h1 id="appendix-a-references"><a name="References" href="#References">Appendix
 <p>While any hyperlinks included in this appendix were valid at the time of publication, OASIS cannot guarantee their long-term validity.</p>
 <h2 id="a1-normative-references"><a name="NormativeReferences" href="#NormativeReferences">A.1 Normative References</a></h2>
 <p>The following documents are referenced in such a way that some or all of their content constitutes requirements of this document.</p>
-<p><code>(Reference sources: For references to IETF RFCs, use the approved citation formats at:   https://docs.oasis-open.org/templates/ietf-rfc-list/ietf-rfc-list.html.   For references to W3C Recommendations, use the approved citation formats at:   https://docs.oasis-open.org/templates/w3c-recommendations-list/w3c-recommendations-list.html.   Remove this note before submitting for publication.)</code></p>
 <h6 id="odata-v402">[OData-v4.02]</h6>
 <ul>
 <li><em>OData Version 4.02</em>. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
@@ -696,34 +752,30 @@ <h6 id="odata-v402">[OData-v4.02]</h6>
 <li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
 </ul></li>
 </ul>
-<h6 id="rfc2119"><a name="rfc2119">[RFC2119]</a></h6>
-<p><em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
-<a href="http://www.rfc-editor.org/info/rfc2119">http://www.rfc-editor.org/info/rfc2119</a>.</p>
-<h6 id="rfc8174"><a name="rfc8174">[RFC8174]</a></h6>
-<p><em>Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017</em>.<br />
-<a href="http://www.rfc-editor.org/info/rfc8174">http://www.rfc-editor.org/info/rfc8174</a>.</p>
-<h6 id="rfc6570"><a name="rfc6570">[RFC6570]</a></h6>
-<p><em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012</em>.<br />
-<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
-<h6 id="rfc7493"><a name="rfc7493">[RFC7493]</a></h6>
-<p><em>Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015</em>.<br />
-<a href="https://tools.ietf.org/html/rfc7493">https://tools.ietf.org/html/rfc7493</a>.</p>
-<h6 id="rfc8259"><a name="rfc8259">[RFC8259]</a></h6>
-<p><em>Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017</em>.<br />
-<a href="http://tools.ietf.org/html/rfc8259">http://tools.ietf.org/html/rfc8259</a>.</p>
 <h6 id="ecmascript"><a name="ECMAScript">[ECMAScript]</a></h6>
 <p><em>ECMAScript 2016 Language Specification, 7th Edition</em>. June 2016. Standard ECMA-262. <a href="http://www.ecma-international.org/publications/standards/Ecma-262.htm">http://www.ecma-international.org/publications/standards/Ecma-262.htm</a>.</p>
 <h6 id="epsg"><a name="EPSG">[EPSG]</a></h6>
-<p><em>European Petroleum Survey Group (EPSG)</em>. <a href="http://www.epsg.org/">http://www.epsg.org/</a>.</p>
+<p><em>European Petroleum Survey Group (EPSG)</em>. <a href="http://www.epsg.org/.######">http://www.epsg.org/.######</a> <a name="rfc7493">[RFC7493]</a> <em>Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015</em>.<br />
+<a href="https://tools.ietf.org/html/rfc7493.######">https://tools.ietf.org/html/rfc7493.######</a> <a name="rfc2119">[RFC2119]</a> <em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
+<a href="http://www.rfc-editor.org/info/rfc2119">http://www.rfc-editor.org/info/rfc2119</a>.</p>
 <h6 id="odata-abnf"><a name="ODataABNF">[OData-ABNF]</a></h6>
 <p><em>OData ABNF Construction Rules Version 4.01</em>.<br />
 See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
 <h6 id="odata-csdl-schema"><a name="ODataCSDL">[OData-CSDL-Schema]</a></h6>
 <p><em>OData CSDL JSON Schema</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
+<h6 id="odata-csdljson"><a name="ODataCSDLJSON">[OData-CSDLJSON]</a></h6>
+<p><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01</em>.<br />
+See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
 <h6 id="odata-csdlxml"><a name="ODataCSDLXML">[OData-CSDLXML]</a></h6>
 <p><em>OData Common Schema Definition Language (CSDL) XML Representation Version 4.01</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
+<h6 id="odata-edm"><a name="ODataEDM">[OData-EDM]</a></h6>
+<p><em>OData EDM XML Schema</em>.<br />
+See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
+<h6 id="odata-edmx"><a name="ODataEDMX">[OData-EDMX]</a></h6>
+<p><em>OData EDM XML Schema</em>.<br />
+See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
 <h6 id="odata-json"><a name="ODataJSON">[OData-JSON]</a></h6>
 <p><em>OData JSON Format Version 4.01</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
@@ -741,13 +793,33 @@ <h6 id="odata-vocmeasures"><a name="ODataVocMeasures">[OData-VocMeasures]</a></h
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
 <h6 id="odata-vocvalidation"><a name="ODataVocValidation">[OData-VocValidation]</a></h6>
 <p><em>OData Vocabularies Version 4.0: Validation Vocabulary</em>.<br />
-See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
-<h6 id="xml-schema-2"><a name="XMLSchema">[XML-Schema-2]</a></h6>
+See link in "<a href="#RelatedWork">Related work</a>" section on cover page.###### <a name="rfc6570">[RFC6570]</a> <em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012</em>.<br />
+<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
+<h6 id="rfc2119"><a name="rfc2119">[RFC2119]</a></h6>
+<p><em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
+<a href="https://www.rfc-editor.org/info/rfc2119">https://www.rfc-editor.org/info/rfc2119</a>.</p>
+<h6 id="rfc6570"><a name="rfc6570">[RFC6570]</a></h6>
+<p><em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, “URI Template”, RFC 6570, March 2012</em>.<br />
+<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
+<h6 id="rfc8174"><a name="rfc8174">[RFC8174]</a></h6>
+<p><em>Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017</em>.<br />
+<a href="http://www.rfc-editor.org/info/rfc8174">http://www.rfc-editor.org/info/rfc8174</a>.</p>
+<h6 id="rfc8259"><a name="rfc8259">[RFC8259]</a></h6>
+<p><em>Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017</em>.<br />
+<a href="http://tools.ietf.org/html/rfc8259">http://tools.ietf.org/html/rfc8259</a>.</p>
+<h6 id="xml-11"><a name="XML11">[XML-1.1]</a></h6>
+<p><em>Extensible Markup Language (XML) 1.1 (Second Edition)</em>. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.<br />
+<a href="http://www.w3.org/TR/2006/REC-xml11-20060816">http://www.w3.org/TR/2006/REC-xml11-20060816</a>. Latest version available at <a href="http://www.w3.org/TR/xml11/">http://www.w3.org/TR/xml11/</a>.</p>
+<h6 id="xml-base"><a name="XMLBase">[XML-Base]</a></h6>
+<p><em>XML Base (Second Edition)</em>. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.<br />
+<a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/">http://www.w3.org/TR/2009/REC-xmlbase-20090128/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>.</p>
+<h6 id="xml-schema-1"><a name="XMLSchema1">[XML-Schema-1]</a></h6>
+<p><em>W3C XML Schema Definition Language (XSD) 1.1 Part 1: Structures</em>. D. Beech, M. Maloney, C. M. Sperberg-McQueen, H. S. Thompson, S. Gao, N. Mendelsohn, Editors, W3C Recommendation, 5 April 2012.<br />
+<a href="http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/">http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlschema11-1/">http://www.w3.org/TR/xmlschema11-1/</a>.</p>
+<h6 id="xml-schema-2"><a name="XMLSchema2">[XML-Schema-2]</a></h6>
 <p><em>W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes</em>. D. Peterson, S. Gao, C. M. Sperberg-McQueen, H. S. Thompson, P. V. Biron, A. Malhotra, Editors, W3C Recommendation, 5 April 2012.<br />
 <a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/">http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlschema11-2/">http://www.w3.org/TR/xmlschema11-2/</a>.</p>
 <h2 id="a2-informative-references"><a name="InformativeReferences" href="#InformativeReferences">A.2 Informative References</a></h2>
-<h6 id="rfc3552"><a name="rfc3552">[RFC3552]</a></h6>
-<p><em>Rescorla, E. and B. Korver, "Guidelines for Writing RFC Text on Security Considerations", BCP 72, RFC 3552, DOI 10.17487/RFC3552, July 2003</em> <a href="https://www.rfc-editor.org/info/rfc3552">https://www.rfc-editor.org/info/rfc3552</a>.</p>
 <h6 id="openui5"><a name="OpenUI5">[OpenUI5]</a></h6>
 <p><em>OpenUI5 Version 1.40.10 - OData V4 Metadata JSON Format</em>.<br />
 <a href="https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html">https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html</a>.</p>
@@ -771,6 +843,11 @@ <h1 id="appendix-b-table-of-json-objects-and-members"><a name="TableofJSONObject
 <li><a href="#Qualifier2.6"><code>$Qualifier</code></a></li>
 <li><a href="#TargetNamespace2.7"><code>$TargetNamespace</code></a></li>
 </ul></li>
+<li><a href="#SchemaObject3">Schema Object</a>
+<ul>
+<li><a href="#Alias3.1"><code>$Alias</code></a></li>
+<li><a href="#Annotations3.2"><code>$Annotations</code></a></li>
+</ul></li>
 </ul>
 </div>
 <hr />
diff --git a/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.md b/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.md
index 3a7f73f78..36382897a 100644
--- a/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.md
+++ b/docs/odata-csdl-json/odata-csdl-json-v4.02-csd01.md
@@ -40,7 +40,7 @@ Heiko Theißen (heiko.theissen@sap.com), [SAP SE](http://www.sap.com/)
 
 #### <a name="AdditionalArtifacts">Additional artifacts:</a>
 This prose specification is one component of a Work Product that also includes:
-* XML schemas: (list file names or directory name)
+* XML schemas: _OData EDMX XML Schema and OData EDM XML Schema_. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/
 * Other parts (list titles and/or file names)
 * `(Note: Any normative computer language definitions that are part of the Work Product, such as XML instances, schemas and Java(TM) code, including fragments of such, must be (a) well formed and valid, (b) provided in separate plain text files, (c) referenced from the Work Product; and (d) where any definition in these separate files disagrees with the definition found in the specification, the definition in the separate file prevails. Remove this note before submitting for publication.)`
 
@@ -50,8 +50,12 @@ This specification replaces or supersedes:
 
 This specification is related to:
 * _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
-  * _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
-  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _OData Version 4.02 Part 1: Protocol_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
+  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _ABNF components: OData ABNF Construction Rules Version 4.01 and OData ABNF Test Cases_. https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/
+* _OData Vocabularies Version 4.0_. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html
+* _OData Common Schema Definition Language (CSDL) XML Representation Version 4.01_. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html
+* _OData JSON Format Version 4.01_. Edited by Ralf Handl, Mike Pizzo, and Mark Biamonte. Latest stage: https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html
 
 #### Abstract:
 OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.
@@ -118,6 +122,9 @@ For complete copyright information please see the full Notices section in an App
   - [4.1 Reference](#Reference)
   - [4.2 Included Schema](#IncludedSchema)
   - [4.3 Included Annotations](#IncludedAnnotations)
+- [5 Schema](#Schema)
+  - [5.1 Alias](#Alias)
+  - [5.2 Annotations with External Targeting](#AnnotationswithExternalTargeting)
 - [A References](#References)
   - [A.1 Normative References](#NormativeReferences)
   - [A.2 Informative References](#InformativeReferences)
@@ -351,7 +358,7 @@ they have the default value.
 ## <a name="JSONSchemaDefinition" href="#JSONSchemaDefinition">2.3 JSON Schema Definition</a>
 
 The structure of CSDL JSON documents can be verified with the JSON
-Schema [OData-CSDL-Schema](#CSDLschema) provided as an
+Schema [OData-CSDL-Schema](#ODataCSDL) provided as an
 additional artifact of this prose specification. This schema only
 defines the shape of a well-formed CSDL JSON document but is not
 descriptive enough to define what a correct CSDL JSON document MUST be
@@ -470,7 +477,7 @@ Type|Meaning
 `Edm.GeometryCollection`         |Collection of arbitrary Geometry values
 
 `Edm.Date` and `Edm.DateTimeOffset` follow
-[XML-Schema-2](#XMLSchema) and use the proleptic Gregorian
+[XML-Schema-2](#XMLSchema2) and use the proleptic Gregorian
 calendar, allowing the year `0000` (equivalent to 1 BCE) and negative
 years (year `-0001` being equivalent to 2 BCE etc.). The supported date
 range is service-specific and typically depends on the underlying
@@ -869,6 +876,119 @@ a term from the `org.example.hcm` namespace to an element of the
 `com.example.Person` namespace and specify a `Tablet` qualifier.
 :::
 
+-------
+
+# <a name="Schema" href="#Schema">5 Schema</a>
+
+One or more schemas describe the entity model exposed by an OData
+service. The schema acts as a namespace for elements of the entity model
+such as entity types, complex types, enumerations and terms.
+
+A schema is identified by a [namespace](#Namespace). Schema namespaces
+MUST be unique within the scope of a document and SHOULD be globally
+unique. A schema cannot span more than one document.
+
+The schema's namespace is combined with the name of elements in the
+schema to create unique [qualified names](#QualifiedName), so
+identifiers that are used to name types MUST be unique within a
+namespace to prevent ambiguity.
+
+Names are case-sensitive, but service authors SHOULD NOT choose names
+that differ only in case.
+
+The namespace MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+::: {.varjson .rep}
+### <a name="SchemaObject3" href="#SchemaObject3"> Schema Object</a>
+
+A schema is represented as a member of the document object whose name is
+the schema namespace. Its value is an object that MAY contain the
+members [`$Alias`](#Alias) and
+[`$Annotations`](#AnnotationswithExternalTargeting).
+
+The schema object MAY contain members representing [entity
+types](#EntityType), [complex types](#ComplexType), [enumeration
+types](#EnumerationType), [type definitions](#TypeDefinition),
+[actions](#Action), [functions](#Function), [terms](#Term), and an
+[entity container](#EntityContainer).
+
+The schema object MAY also contain [annotations](#Annotation) that apply
+to the schema itself.
+:::
+
+
+## <a name="Alias" href="#Alias">5.1 Alias</a>
+
+A schema MAY specify an alias which MUST be a [simple
+identifier](#SimpleIdentifier).
+
+::: varjson
+If a schema specifies an alias, the alias MUST be used instead of the
+namespace within qualified names throughout the document to identify
+model elements of that schema. A mixed use of namespace-qualified names
+and alias-qualified names is not allowed.
+:::
+
+
+Aliases are document-global, so all schemas defined within or included
+into a document MUST have different aliases, and aliases MUST differ
+from the namespaces of all schemas defined within or included into a
+document. Aliases defined by a schema can be used throughout the
+containing document and are not restricted to the schema that defines
+them.
+
+The alias MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+::: {.varjson .rep}
+### <a name="Alias3.1" href="#Alias3.1"> `$Alias`</a>
+
+The value of `$Alias` is a string containing the alias for the schema.
+:::
+
+::: {.varjson .example}
+Example 6: document defining a schema `org.example` with an alias and a
+description for the schema
+```json
+{
+  ...
+  "org.example": {
+    "$Alias": "self",     "@Core.Description": "Example schema",
+    ...   },
+  ... }
+```
+:::
+
+
+
+## <a name="AnnotationswithExternalTargeting" href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a>
+
+::: {.varjson .rep}
+### <a name="Annotations3.2" href="#Annotations3.2"> `$Annotations`</a>
+
+The value of `$Annotations` is an object with one member per [annotation
+target](#Target). The member name is a path identifying the [annotation
+target](#Target), the member value is an object containing
+[annotations](#Annotation) for that target.
+:::
+
+::: {.varjson .example}
+Example 7: annotations targeting the `Person` type with qualifier
+`Tablet`
+```json
+"org.example": {
+  "$Alias": "self",   "$Annotations": {
+    "self.Person": {
+      "@Core.Description#Tablet": "Dummy",
+      ...
+    }
+  } },
+```
+:::
+
+
+
 -------
 
 # <a name="References" href="#References">Appendix A. References</a>
@@ -883,43 +1003,20 @@ While any hyperlinks included in this appendix were valid at the time of publica
 
 The following documents are referenced in such a way that some or all of their content constitutes requirements of this document.
 
-`(Reference sources:
-For references to IETF RFCs, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/ietf-rfc-list/ietf-rfc-list.html.  
-For references to W3C Recommendations, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/w3c-recommendations-list/w3c-recommendations-list.html.  
-Remove this note before submitting for publication.)`
-
 ###### [OData-v4.02]
 - _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
   - _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
   - _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
 
-###### <a name="rfc2119">[RFC2119]</a>
-_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
-http://www.rfc-editor.org/info/rfc2119.
-
-###### <a name="rfc8174">[RFC8174]</a>
-_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
-http://www.rfc-editor.org/info/rfc8174.
-
-###### <a name="rfc6570">[RFC6570]</a>
-_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
-http://tools.ietf.org/html/rfc6570.
-
-###### <a name="rfc7493">[RFC7493]</a>
-_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
-https://tools.ietf.org/html/rfc7493.
-
-###### <a name="rfc8259">[RFC8259]</a>
-_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
-http://tools.ietf.org/html/rfc8259.
-
 ###### <a name="ECMAScript">[ECMAScript]</a>
 _ECMAScript 2016 Language Specification, 7th Edition_. June 2016. Standard ECMA-262. http://www.ecma-international.org/publications/standards/Ecma-262.htm.
 
 ###### <a name="EPSG">[EPSG]</a>
-_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.
+_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.###### <a name="rfc7493">[RFC7493]</a>
+_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
+https://tools.ietf.org/html/rfc7493.###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+http://www.rfc-editor.org/info/rfc2119.
 
 ###### <a name="ODataABNF">[OData-ABNF]</a>
 _OData ABNF Construction Rules Version 4.01_.  
@@ -929,10 +1026,22 @@ See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page
 _OData CSDL JSON Schema_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataCSDLJSON">[OData-CSDLJSON]</a>
+_OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01_.  
+See link in "[Related work](#RelatedWork)" section on cover page.
+
 ###### <a name="ODataCSDLXML">[OData-CSDLXML]</a>
 _OData Common Schema Definition Language (CSDL) XML Representation Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataEDM">[OData-EDM]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
+###### <a name="ODataEDMX">[OData-EDMX]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
 ###### <a name="ODataJSON">[OData-JSON]</a>
 _OData JSON Format Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
@@ -955,18 +1064,43 @@ See link in "[Related work](#RelatedWork)" section on cover page.
 
 ###### <a name="ODataVocValidation">[OData-VocValidation]</a>
 _OData Vocabularies Version 4.0: Validation Vocabulary_.  
-See link in "[Related work](#RelatedWork)" section on cover page.
+See link in "[Related work](#RelatedWork)" section on cover page.###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
+
+###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+https://www.rfc-editor.org/info/rfc2119.
 
-###### <a name="XMLSchema">[XML-Schema-2]</a>
+###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, “URI Template”, RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
+
+###### <a name="rfc8174">[RFC8174]</a>
+_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
+http://www.rfc-editor.org/info/rfc8174.
+
+###### <a name="rfc8259">[RFC8259]</a>
+_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
+http://tools.ietf.org/html/rfc8259.
+
+###### <a name="XML11">[XML-1.1]</a>
+_Extensible Markup Language (XML) 1.1 (Second Edition)_. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.  
+http://www.w3.org/TR/2006/REC-xml11-20060816. Latest version available at http://www.w3.org/TR/xml11/.
+
+###### <a name="XMLBase">[XML-Base]</a>
+_XML Base (Second Edition)_. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.  
+http://www.w3.org/TR/2009/REC-xmlbase-20090128/. Latest version available at http://www.w3.org/TR/xmlbase/. 
+###### <a name="XMLSchema1">[XML-Schema-1]</a>
+_W3C XML Schema Definition Language (XSD) 1.1 Part 1: Structures_. D. Beech, M. Maloney, C. M. Sperberg-McQueen, H. S. Thompson, S. Gao, N. Mendelsohn, Editors, W3C Recommendation, 5 April 2012.  
+http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-1/.
+
+###### <a name="XMLSchema2">[XML-Schema-2]</a>
 _W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes_. D. Peterson, S. Gao, C. M. Sperberg-McQueen, H. S. Thompson, P. V. Biron, A. Malhotra, Editors, W3C Recommendation, 5 April 2012.  
 http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-2/.
 
 ## <a name="InformativeReferences" href="#InformativeReferences">A.2 Informative References</a>
 
-###### <a name="rfc3552">[RFC3552]</a>
-_Rescorla, E. and B. Korver, "Guidelines for Writing RFC Text on Security Considerations", BCP 72, RFC 3552, DOI 10.17487/RFC3552, July 2003_
-https://www.rfc-editor.org/info/rfc3552.
-
 ###### <a name="OpenUI5">[OpenUI5]</a>
 _OpenUI5 Version 1.40.10 - OData V4 Metadata JSON Format_.  
 https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html.
@@ -988,6 +1122,9 @@ https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a4
   - [`$TermNamespace`](#TermNamespace2.5)
   - [`$Qualifier`](#Qualifier2.6)
   - [`$TargetNamespace`](#TargetNamespace2.7)
+- [Schema Object](#SchemaObject3)
+  - [`$Alias`](#Alias3.1)
+  - [`$Annotations`](#Annotations3.2)
 :::
 
 -------
diff --git a/docs/odata-csdl-json/styles/odata.css b/docs/odata-csdl-json/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-csdl-json/styles/odata.css
+++ b/docs/odata-csdl-json/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.html b/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.html
index ce7e41e85..991d68b74 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.html
+++ b/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.html
@@ -119,7 +119,7 @@ <h4 id="editors">Editors:</h4>
 <h4 id="additional-artifacts"><a name="AdditionalArtifacts">Additional artifacts:</a></h4>
 <p>This prose specification is one component of a Work Product that also includes:</p>
 <ul>
-<li>XML schemas: (list file names or directory name)</li>
+<li>XML schemas: <em>OData EDMX XML Schema and OData EDM XML Schema</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/">https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/</a></li>
 <li>Other parts (list titles and/or file names)</li>
 <li><code>(Note: Any normative computer language definitions that are part of the Work Product, such as XML instances, schemas and Java(TM) code, including fragments of such, must be (a) well formed and valid, (b) provided in separate plain text files, (c) referenced from the Work Product; and (d) where any definition in these separate files disagrees with the definition found in the specification, the definition in the separate file prevails. Remove this note before submitting for publication.)</code></li>
 </ul>
@@ -132,9 +132,13 @@ <h4 id="related-work"><a name="RelatedWork">Related work:</a></h4>
 <ul>
 <li><em>OData Version 4.02</em>. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
 <ul>
-<li><em>OData Version 4.02 Part 1: Protocol</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html</a></li>
-<li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
+<li><em>OData Version 4.02 Part 1: Protocol</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html</a></li>
+<li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage: <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
+<li><em>ABNF components: OData ABNF Construction Rules Version 4.01 and OData ABNF Test Cases</em>. <a href="https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/">https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/</a></li>
 </ul></li>
+<li><em>OData Vocabularies Version 4.0</em>. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html">https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html</a></li>
+<li><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01</em>. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html">https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html</a></li>
+<li><em>OData JSON Format Version 4.01</em>. Edited by Ralf Handl, Mike Pizzo, and Mark Biamonte. Latest stage: <a href="https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html">https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html</a></li>
 </ul>
 <h4 id="abstract">Abstract:</h4>
 <p>OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.</p>
@@ -194,6 +198,11 @@ <h1 id="table-of-contents">Table of Contents</h1>
 <li><a href="#IncludedSchema">4.2 Included Schema</a></li>
 <li><a href="#IncludedAnnotations">4.3 Included Annotations</a></li>
 </ul></li>
+<li><a href="#Schema">5 Schema</a>
+<ul>
+<li><a href="#Alias">5.1 Alias</a></li>
+<li><a href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a></li>
+</ul></li>
 <li><a href="#References">A References</a>
 <ul>
 <li><a href="#NormativeReferences">A.1 Normative References</a></li>
@@ -253,8 +262,8 @@ <h3>Representation-Specific Headline</h3>
 <p>This uses pandoc 3.1.2 from <a href="https://github.com/jgm/pandoc/releases/tag/3.1.2">https://github.com/jgm/pandoc/releases/tag/3.1.2</a>.</p>
 </div>
 <h1 id="2-xml-representation"><a name="XMLRepresentation" href="#XMLRepresentation">2 XML Representation</a></h1>
-<p>OData CSDL XML is a full representation of the OData Common Schema Definition Language in the Extensible Markup Language (XML) 1.1 (Second Edition) <a href="#BMXML">XML-1.1</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#BMXMLSchema1">XML-Schema-1</a> and <a href="#BMXMLSchema2">XML-Schema-2</a>.</p>
-<p>It is an alternative to the CSDL JSON representation defined in <a href="#BMCSDLJSON">OData-CSDLJSON</a> and neither adds nor removes features.</p>
+<p>OData CSDL XML is a full representation of the OData Common Schema Definition Language in the Extensible Markup Language (XML) 1.1 (Second Edition) <a href="#XML11">XML-1.1</a> with further building blocks from the W3C XML Schema Definition Language (XSD) 1.1 as described in <a href="#XMLSchema1">XML-Schema-1</a> and <a href="#XMLSchema2">XML-Schema-2</a>.</p>
+<p>It is an alternative to the CSDL JSON representation defined in <a href="#ODataCSDLJSON">OData-CSDLJSON</a> and neither adds nor removes features.</p>
 <h2 id="21-requesting-the-xml-representation"><a name="RequestingtheXMLRepresentation" href="#RequestingtheXMLRepresentation">2.1 Requesting the XML Representation</a></h2>
 <p>The OData CSDL XML representation can be requested using the <code>$format</code> query option in the request URL with the media type <code>application/xml</code>, optionally followed by media type parameters, or the case-insensitive abbreviation <code>xml</code> which MUST NOT be followed by media type parameters.</p>
 <p>Alternatively, this representation can be requested using the <code>Accept</code> header with the media type <code>application/xml</code>, optionally followed by media type parameters.</p>
@@ -290,7 +299,7 @@ <h3 id="222-namespace-edm"><a name="NamespaceEDM" href="#NamespaceEDM">2.2.2 Nam
 <p>They are non-normative for this specification.</p>
 <p>In this specification the namespace prefix <code>edm</code> is used to represent the Entity Data Model namespace, however the prefix name is not prescriptive.</p>
 <h2 id="23-xml-schema-definitions"><a name="XMLSchemaDefinitions" href="#XMLSchemaDefinitions">2.3 XML Schema Definitions</a></h2>
-<p>This specification contains normative XML schemas for the EDMX and EDM namespaces; see <a href="#BMEDMX">OData-EDMX</a> and <a href="#BMEDM">OData-EDM</a></p>
+<p>This specification contains normative XML schemas for the EDMX and EDM namespaces; see <a href="#ODataEDMX">OData-EDMX</a> and <a href="#ODataEDM">OData-EDM</a></p>
 <p>These XML schemas only define the shape of a well-formed CSDL XML document and are not descriptive enough to define what a correct CSDL XML document MUST be in every imaginable use case. This specification document defines additional rules that correct CSDL XML documents MUST fulfill. In case of doubt on what makes a CSDL XML document correct the rules defined in this specification document take precedence.</p>
 <h2 id="24-xml-document-order"><a name="XMLDocumentOrder" href="#XMLDocumentOrder">2.4 XML Document Order</a></h2>
 <p>Client libraries MUST retain the document order of XML elements for CSDL XML documents because for some elements the order of child elements is significant. This includes, but is not limited to, <a href="#EnumerationTypeMember">members of enumeration types</a> and items within a <a href="#Collection">collection expression</a>.</p>
@@ -454,7 +463,7 @@ <h2 id="33-primitive-types"><a name="PrimitiveTypes" href="#PrimitiveTypes">3.3
 </tr>
 </tbody>
 </table>
-<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XMLSchema">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
+<p><code>Edm.Date</code> and <code>Edm.DateTimeOffset</code> follow <a href="#XMLSchema2">XML-Schema-2</a> and use the proleptic Gregorian calendar, allowing the year <code>0000</code> (equivalent to 1 BCE) and negative years (year <code>-0001</code> being equivalent to 2 BCE etc.). The supported date range is service-specific and typically depends on the underlying persistency layer, e.g. SQL only supports years <code>0001</code> to <code>9999</code>.</p>
 <p><code>Edm.Decimal with a </code><a href="#Scale"><code>Scale</code></a><code> value of floating</code>, <code>Edm.Double</code>, and <code>Edm.Single</code> allow the special numeric values <code>-INF</code>, <code>INF</code>, and <code>NaN</code>.</p>
 <p><code>Edm.Stream</code> is a primitive type that can be used as a property of an <a href="#EntityType">entity type</a> or <a href="#ComplexType">complex type</a>, the underlying type for a <a href="#TypeDefinition">type definition</a>, or the binding parameter or return type of an <a href="#Action">action</a> or <a href="#Function">function</a>. <code>Edm.Stream</code>, or a type definition whose underlying type is <code>Edm.Stream</code>, cannot be used in collections or for non-binding parameters to functions or actions.</p>
 <p>Some of these types allow <a href="#TypeFacets">facets</a>, defined in section "<a href="#TypeFacets">Type Facets</a>".</p>
@@ -649,6 +658,54 @@ <h3 id="-attribute-targetnamespace"><a name="AttributeTargetNamespace4.3" href="
 </ul>
 </div>
 <hr />
+<h1 id="5-schema"><a name="Schema" href="#Schema">5 Schema</a></h1>
+<p>One or more schemas describe the entity model exposed by an OData service. The schema acts as a namespace for elements of the entity model such as entity types, complex types, enumerations and terms.</p>
+<p>A schema is identified by a <a href="#Namespace">namespace</a>. Schema namespaces MUST be unique within the scope of a document and SHOULD be globally unique. A schema cannot span more than one document.</p>
+<p>The schema's namespace is combined with the name of elements in the schema to create unique <a href="#QualifiedName">qualified names</a>, so identifiers that are used to name types MUST be unique within a namespace to prevent ambiguity.</p>
+<p>Names are case-sensitive, but service authors SHOULD NOT choose names that differ only in case.</p>
+<p>The namespace MUST NOT be one of the reserved values <code>Edm</code>, <code>odata</code>, <code>System</code>, or <code>Transient</code>.</p>
+<div class="varxml rep">
+<h3 id="-element-edmschema"><a name="ElementedmSchema5" href="#ElementedmSchema5"> Element <code>edm:Schema</code></a></h3>
+<p>The <code>edm:Schema</code> element defines a schema. It MUST contain the <code>Namespace</code> attribute and it MAY contain the <code>Alias</code> attribute.</p>
+<p>It MAY contain elements <a href="#Action"><code>edm:Action</code></a>, <a href="#AnnotationswithExternalTargeting"><code>edm:Annotations</code></a>, <a href="#Annotation"><code>edm:Annotation</code></a>, <a href="#ComplexType"><code>edm:ComplexType</code></a>, <a href="#EntityContainer"><code>edm:EntityContainer</code></a>, <a href="#EntityType"><code>edm:EntityType</code></a>, <a href="#EnumerationType"><code>edm:EnumType</code></a>, <a href="#Function"><code>edm:Function</code></a>, <a href="#Term"><code>edm:Term</code></a>, or <a href="#TypeDefinition"><code>edm:TypeDefinition</code></a>.</p>
+<h3 id="-attribute-namespace-1"><a name="AttributeNamespace5.1" href="#AttributeNamespace5.1"> Attribute <code>Namespace</code></a></h3>
+<p>The value of <code>Namespace</code> is the namespace of the schema</p>
+</div>
+<h2 id="51-alias"><a name="Alias" href="#Alias">5.1 Alias</a></h2>
+<p>A schema MAY specify an alias which MUST be a <a href="#SimpleIdentifier">simple identifier</a>.</p>
+<div class="varxml">
+<p>If a schema specifies an alias, the alias MAY be used instead of the namespace within qualified names to identify model elements of that schema. An alias only provides a more convenient notation, allowing a short string to be substituted for a long namespace. Every model element that can be identified via an alias-qualified name can alternatively be identified via its full namespace-qualified name.</p>
+</div>
+<p>Aliases are document-global, so all schemas defined within or included into a document MUST have different aliases, and aliases MUST differ from the namespaces of all schemas defined within or included into a document. Aliases defined by a schema can be used throughout the containing document and are not restricted to the schema that defines them.</p>
+<p>The alias MUST NOT be one of the reserved values <code>Edm</code>, <code>odata</code>, <code>System</code>, or <code>Transient</code>.</p>
+<section id="-attribute-alias-1" class="varxml rep">
+<h3><a name="AttributeAlias5.2" href="#AttributeAlias5.2"> Attribute <code>Alias</code></a></h3>
+<p>The value of <code>Alias</code> is a <a href="#SimpleIdentifier">simple identifier</a>.</p>
+</section>
+<div class="varxml example">
+<p>Example 6: schema <code>org.example</code> with an alias and a description for the schema</p>
+<div class="sourceCode" id="cb7"><pre class="sourceCode xml"><code class="sourceCode xml"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a>&lt;<span class="kw">Schema</span><span class="ot"> Namespace=</span><span class="st">&quot;org.example&quot;</span><span class="ot"> Alias=</span><span class="st">&quot;self&quot;</span>&gt;   &lt;<span class="kw">Annotation</span><span class="ot"> Term=</span><span class="st">&quot;Core.Description&quot;</span><span class="ot"> String=</span><span class="st">&quot;Example schema&quot;</span> /&gt;</span>
+<span id="cb7-2"><a href="#cb7-2" aria-hidden="true" tabindex="-1"></a>  ...</span>
+<span id="cb7-3"><a href="#cb7-3" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Schema</span>&gt;</span></code></pre></div>
+</div>
+<h2 id="52-annotations-with-external-targeting"><a name="AnnotationswithExternalTargeting" href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a></h2>
+<div class="varxml rep">
+<h3 id="-element-edmannotations"><a name="ElementedmAnnotations6" href="#ElementedmAnnotations6"> Element <code>edm:Annotations</code></a></h3>
+<p>The <code>edm:Annotations</code> element is used to apply a group of annotations to a single model element. It MUST contain the <code>Target</code> attribute and it MAY contain the <code>Qualifier</code> attribute.</p>
+<p>It MUST contain at least one <a href="#Annotation"><code>edm:Annotation</code></a> element.</p>
+<h3 id="-attribute-target"><a name="AttributeTarget6.1" href="#AttributeTarget6.1"> Attribute <code>Target</code></a></h3>
+<p>The value of <code>Target</code> is a path expression identifying the <a href="#Target">annotation target</a>. It MUST resolve to a model element in scope.</p>
+<h3 id="-attribute-qualifier-1"><a name="AttributeQualifier6.2" href="#AttributeQualifier6.2"> Attribute <code>Qualifier</code></a></h3>
+<p>The value of <code>Qualifier</code> is a <a href="#SimpleIdentifier">simple identifier</a>.</p>
+</div>
+<div class="varxml example">
+<p>Example 7: annotations should only be applied to tablet devices</p>
+<div class="sourceCode" id="cb8"><pre class="sourceCode xml"><code class="sourceCode xml"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a>&lt;<span class="kw">Annotations</span><span class="ot"> Target=</span><span class="st">&quot;org.example.Person&quot;</span><span class="ot"> Qualifier=</span><span class="st">&quot;Tablet&quot;</span>&gt;</span>
+<span id="cb8-2"><a href="#cb8-2" aria-hidden="true" tabindex="-1"></a>  &lt;<span class="kw">Annotation</span><span class="ot"> Term=</span><span class="st">&quot;Core.Description&quot;</span><span class="ot"> String=</span><span class="st">&quot;Dummy&quot;</span> /&gt;</span>
+<span id="cb8-3"><a href="#cb8-3" aria-hidden="true" tabindex="-1"></a>  ...</span>
+<span id="cb8-4"><a href="#cb8-4" aria-hidden="true" tabindex="-1"></a>&lt;/<span class="kw">Annotations</span>&gt;</span></code></pre></div>
+</div>
+<hr />
 <h1 id="appendix-a-references"><a name="References" href="#References">Appendix A. References</a></h1>
 <!-- Required section -->
 
@@ -656,7 +713,6 @@ <h1 id="appendix-a-references"><a name="References" href="#References">Appendix
 <p>While any hyperlinks included in this appendix were valid at the time of publication, OASIS cannot guarantee their long-term validity.</p>
 <h2 id="a1-normative-references"><a name="NormativeReferences" href="#NormativeReferences">A.1 Normative References</a></h2>
 <p>The following documents are referenced in such a way that some or all of their content constitutes requirements of this document.</p>
-<p><code>(Reference sources: For references to IETF RFCs, use the approved citation formats at:   https://docs.oasis-open.org/templates/ietf-rfc-list/ietf-rfc-list.html.   For references to W3C Recommendations, use the approved citation formats at:   https://docs.oasis-open.org/templates/w3c-recommendations-list/w3c-recommendations-list.html.   Remove this note before submitting for publication.)</code></p>
 <h6 id="odata-v402">[OData-v4.02]</h6>
 <ul>
 <li><em>OData Version 4.02</em>. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
@@ -665,34 +721,30 @@ <h6 id="odata-v402">[OData-v4.02]</h6>
 <li><em>OData Version 4.02 Part 2: URL Conventions</em>. Latest stage. <a href="https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html">https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html</a></li>
 </ul></li>
 </ul>
-<h6 id="rfc2119"><a name="rfc2119">[RFC2119]</a></h6>
-<p><em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
-<a href="http://www.rfc-editor.org/info/rfc2119">http://www.rfc-editor.org/info/rfc2119</a>.</p>
-<h6 id="rfc8174"><a name="rfc8174">[RFC8174]</a></h6>
-<p><em>Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017</em>.<br />
-<a href="http://www.rfc-editor.org/info/rfc8174">http://www.rfc-editor.org/info/rfc8174</a>.</p>
-<h6 id="rfc6570"><a name="rfc6570">[RFC6570]</a></h6>
-<p><em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012</em>.<br />
-<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
-<h6 id="rfc7493"><a name="rfc7493">[RFC7493]</a></h6>
-<p><em>Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015</em>.<br />
-<a href="https://tools.ietf.org/html/rfc7493">https://tools.ietf.org/html/rfc7493</a>.</p>
-<h6 id="rfc8259"><a name="rfc8259">[RFC8259]</a></h6>
-<p><em>Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017</em>.<br />
-<a href="http://tools.ietf.org/html/rfc8259">http://tools.ietf.org/html/rfc8259</a>.</p>
 <h6 id="ecmascript"><a name="ECMAScript">[ECMAScript]</a></h6>
 <p><em>ECMAScript 2016 Language Specification, 7th Edition</em>. June 2016. Standard ECMA-262. <a href="http://www.ecma-international.org/publications/standards/Ecma-262.htm">http://www.ecma-international.org/publications/standards/Ecma-262.htm</a>.</p>
 <h6 id="epsg"><a name="EPSG">[EPSG]</a></h6>
-<p><em>European Petroleum Survey Group (EPSG)</em>. <a href="http://www.epsg.org/">http://www.epsg.org/</a>.</p>
+<p><em>European Petroleum Survey Group (EPSG)</em>. <a href="http://www.epsg.org/.######">http://www.epsg.org/.######</a> <a name="rfc7493">[RFC7493]</a> <em>Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015</em>.<br />
+<a href="https://tools.ietf.org/html/rfc7493.######">https://tools.ietf.org/html/rfc7493.######</a> <a name="rfc2119">[RFC2119]</a> <em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
+<a href="http://www.rfc-editor.org/info/rfc2119">http://www.rfc-editor.org/info/rfc2119</a>.</p>
 <h6 id="odata-abnf"><a name="ODataABNF">[OData-ABNF]</a></h6>
 <p><em>OData ABNF Construction Rules Version 4.01</em>.<br />
 See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
 <h6 id="odata-csdl-schema"><a name="ODataCSDL">[OData-CSDL-Schema]</a></h6>
 <p><em>OData CSDL JSON Schema</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
+<h6 id="odata-csdljson"><a name="ODataCSDLJSON">[OData-CSDLJSON]</a></h6>
+<p><em>OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01</em>.<br />
+See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
 <h6 id="odata-csdlxml"><a name="ODataCSDLXML">[OData-CSDLXML]</a></h6>
 <p><em>OData Common Schema Definition Language (CSDL) XML Representation Version 4.01</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
+<h6 id="odata-edm"><a name="ODataEDM">[OData-EDM]</a></h6>
+<p><em>OData EDM XML Schema</em>.<br />
+See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
+<h6 id="odata-edmx"><a name="ODataEDMX">[OData-EDMX]</a></h6>
+<p><em>OData EDM XML Schema</em>.<br />
+See link in "<a href="#AdditionalArtifacts">Additional artifacts</a>" section on cover page.</p>
 <h6 id="odata-json"><a name="ODataJSON">[OData-JSON]</a></h6>
 <p><em>OData JSON Format Version 4.01</em>.<br />
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
@@ -710,13 +762,33 @@ <h6 id="odata-vocmeasures"><a name="ODataVocMeasures">[OData-VocMeasures]</a></h
 See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
 <h6 id="odata-vocvalidation"><a name="ODataVocValidation">[OData-VocValidation]</a></h6>
 <p><em>OData Vocabularies Version 4.0: Validation Vocabulary</em>.<br />
-See link in "<a href="#RelatedWork">Related work</a>" section on cover page.</p>
-<h6 id="xml-schema-2"><a name="XMLSchema">[XML-Schema-2]</a></h6>
+See link in "<a href="#RelatedWork">Related work</a>" section on cover page.###### <a name="rfc6570">[RFC6570]</a> <em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012</em>.<br />
+<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
+<h6 id="rfc2119"><a name="rfc2119">[RFC2119]</a></h6>
+<p><em>Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997</em>.<br />
+<a href="https://www.rfc-editor.org/info/rfc2119">https://www.rfc-editor.org/info/rfc2119</a>.</p>
+<h6 id="rfc6570"><a name="rfc6570">[RFC6570]</a></h6>
+<p><em>Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, “URI Template”, RFC 6570, March 2012</em>.<br />
+<a href="http://tools.ietf.org/html/rfc6570">http://tools.ietf.org/html/rfc6570</a>.</p>
+<h6 id="rfc8174"><a name="rfc8174">[RFC8174]</a></h6>
+<p><em>Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017</em>.<br />
+<a href="http://www.rfc-editor.org/info/rfc8174">http://www.rfc-editor.org/info/rfc8174</a>.</p>
+<h6 id="rfc8259"><a name="rfc8259">[RFC8259]</a></h6>
+<p><em>Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017</em>.<br />
+<a href="http://tools.ietf.org/html/rfc8259">http://tools.ietf.org/html/rfc8259</a>.</p>
+<h6 id="xml-11"><a name="XML11">[XML-1.1]</a></h6>
+<p><em>Extensible Markup Language (XML) 1.1 (Second Edition)</em>. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.<br />
+<a href="http://www.w3.org/TR/2006/REC-xml11-20060816">http://www.w3.org/TR/2006/REC-xml11-20060816</a>. Latest version available at <a href="http://www.w3.org/TR/xml11/">http://www.w3.org/TR/xml11/</a>.</p>
+<h6 id="xml-base"><a name="XMLBase">[XML-Base]</a></h6>
+<p><em>XML Base (Second Edition)</em>. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.<br />
+<a href="http://www.w3.org/TR/2009/REC-xmlbase-20090128/">http://www.w3.org/TR/2009/REC-xmlbase-20090128/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>.</p>
+<h6 id="xml-schema-1"><a name="XMLSchema1">[XML-Schema-1]</a></h6>
+<p><em>W3C XML Schema Definition Language (XSD) 1.1 Part 1: Structures</em>. D. Beech, M. Maloney, C. M. Sperberg-McQueen, H. S. Thompson, S. Gao, N. Mendelsohn, Editors, W3C Recommendation, 5 April 2012.<br />
+<a href="http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/">http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlschema11-1/">http://www.w3.org/TR/xmlschema11-1/</a>.</p>
+<h6 id="xml-schema-2"><a name="XMLSchema2">[XML-Schema-2]</a></h6>
 <p><em>W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes</em>. D. Peterson, S. Gao, C. M. Sperberg-McQueen, H. S. Thompson, P. V. Biron, A. Malhotra, Editors, W3C Recommendation, 5 April 2012.<br />
 <a href="http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/">http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/</a>. Latest version available at <a href="http://www.w3.org/TR/xmlschema11-2/">http://www.w3.org/TR/xmlschema11-2/</a>.</p>
 <h2 id="a2-informative-references"><a name="InformativeReferences" href="#InformativeReferences">A.2 Informative References</a></h2>
-<h6 id="rfc3552"><a name="rfc3552">[RFC3552]</a></h6>
-<p><em>Rescorla, E. and B. Korver, "Guidelines for Writing RFC Text on Security Considerations", BCP 72, RFC 3552, DOI 10.17487/RFC3552, July 2003</em> <a href="https://www.rfc-editor.org/info/rfc3552">https://www.rfc-editor.org/info/rfc3552</a>.</p>
 <h6 id="openui5"><a name="OpenUI5">[OpenUI5]</a></h6>
 <p><em>OpenUI5 Version 1.40.10 - OData V4 Metadata JSON Format</em>.<br />
 <a href="https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html">https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html</a>.</p>
@@ -744,6 +816,16 @@ <h1 id="appendix-b-table-of-xml-elements-and-attributes"><a name="TableofXMLElem
 <li><a href="#AttributeQualifier4.2">Attribute <code>Qualifier</code></a></li>
 <li><a href="#AttributeTargetNamespace4.3">Attribute <code>TargetNamespace</code></a></li>
 </ul></li>
+<li><a href="#ElementedmSchema5">Element <code>edm:Schema</code></a>
+<ul>
+<li><a href="#AttributeNamespace5.1">Attribute <code>Namespace</code></a></li>
+<li><a href="#AttributeAlias5.2">Attribute <code>Alias</code></a></li>
+</ul></li>
+<li><a href="#ElementedmAnnotations6">Element <code>edm:Annotations</code></a>
+<ul>
+<li><a href="#AttributeTarget6.1">Attribute <code>Target</code></a></li>
+<li><a href="#AttributeQualifier6.2">Attribute <code>Qualifier</code></a></li>
+</ul></li>
 </ul>
 </div>
 <hr />
diff --git a/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.md b/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.md
index 68e65bbcf..192bb253f 100644
--- a/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.md
+++ b/docs/odata-csdl-xml/odata-csdl-xml-v4.02-csd01.md
@@ -40,7 +40,7 @@ Heiko Theißen (heiko.theissen@sap.com), [SAP SE](http://www.sap.com/)
 
 #### <a name="AdditionalArtifacts">Additional artifacts:</a>
 This prose specification is one component of a Work Product that also includes:
-* XML schemas: (list file names or directory name)
+* XML schemas: _OData EDMX XML Schema and OData EDM XML Schema_. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/
 * Other parts (list titles and/or file names)
 * `(Note: Any normative computer language definitions that are part of the Work Product, such as XML instances, schemas and Java(TM) code, including fragments of such, must be (a) well formed and valid, (b) provided in separate plain text files, (c) referenced from the Work Product; and (d) where any definition in these separate files disagrees with the definition found in the specification, the definition in the separate file prevails. Remove this note before submitting for publication.)`
 
@@ -50,8 +50,12 @@ This specification replaces or supersedes:
 
 This specification is related to:
 * _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
-  * _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
-  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _OData Version 4.02 Part 1: Protocol_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
+  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _ABNF components: OData ABNF Construction Rules Version 4.01 and OData ABNF Test Cases_. https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/
+* _OData Vocabularies Version 4.0_. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html
+* _OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01_. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html
+* _OData JSON Format Version 4.01_. Edited by Ralf Handl, Mike Pizzo, and Mark Biamonte. Latest stage: https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html
 
 #### Abstract:
 OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.
@@ -116,6 +120,9 @@ For complete copyright information please see the full Notices section in an App
   - [4.1 Reference](#Reference)
   - [4.2 Included Schema](#IncludedSchema)
   - [4.3 Included Annotations](#IncludedAnnotations)
+- [5 Schema](#Schema)
+  - [5.1 Alias](#Alias)
+  - [5.2 Annotations with External Targeting](#AnnotationswithExternalTargeting)
 - [A References](#References)
   - [A.1 Normative References](#NormativeReferences)
   - [A.2 Informative References](#InformativeReferences)
@@ -204,13 +211,13 @@ This uses pandoc 3.1.2 from https://github.com/jgm/pandoc/releases/tag/3.1.2.
 
 OData CSDL XML is a full representation of the OData Common Schema
 Definition Language in the Extensible Markup Language (XML) 1.1 (Second
-Edition) [XML-1.1](#BMXML) with further building blocks from the
+Edition) [XML-1.1](#XML11) with further building blocks from the
 W3C XML Schema Definition Language (XSD) 1.1 as described in
-[XML-Schema-1](#BMXMLSchema1) and
-[XML-Schema-2](#BMXMLSchema2).
+[XML-Schema-1](#XMLSchema1) and
+[XML-Schema-2](#XMLSchema2).
 
 It is an alternative to the CSDL JSON representation defined in
-[OData-CSDLJSON](#BMCSDLJSON) and neither adds nor
+[OData-CSDLJSON](#ODataCSDLJSON) and neither adds nor
 removes features.
 
 ## <a name="RequestingtheXMLRepresentation" href="#RequestingtheXMLRepresentation">2.1 Requesting the XML Representation</a>
@@ -280,8 +287,8 @@ prescriptive.
 ## <a name="XMLSchemaDefinitions" href="#XMLSchemaDefinitions">2.3 XML Schema Definitions</a>
 
 This specification contains normative XML schemas for the EDMX and EDM
-namespaces; see [OData-EDMX](#BMEDMX) and
-[OData-EDM](#BMEDM)
+namespaces; see [OData-EDMX](#ODataEDMX) and
+[OData-EDM](#ODataEDM)
 
 These XML schemas only define the shape of a well-formed CSDL XML
 document and are not descriptive enough to define what a correct CSDL
@@ -410,7 +417,7 @@ Type|Meaning
 `Edm.GeometryCollection`         |Collection of arbitrary Geometry values
 
 `Edm.Date` and `Edm.DateTimeOffset` follow
-[XML-Schema-2](#XMLSchema) and use the proleptic Gregorian
+[XML-Schema-2](#XMLSchema2) and use the proleptic Gregorian
 calendar, allowing the year `0000` (equivalent to 1 BCE) and negative
 years (year `-0001` being equivalent to 2 BCE etc.). The supported date
 range is service-specific and typically depends on the underlying
@@ -806,6 +813,126 @@ a term from the `org.example.hcm` namespace to an element of the
 
 -------
 
+# <a name="Schema" href="#Schema">5 Schema</a>
+
+One or more schemas describe the entity model exposed by an OData
+service. The schema acts as a namespace for elements of the entity model
+such as entity types, complex types, enumerations and terms.
+
+A schema is identified by a [namespace](#Namespace). Schema namespaces
+MUST be unique within the scope of a document and SHOULD be globally
+unique. A schema cannot span more than one document.
+
+The schema's namespace is combined with the name of elements in the
+schema to create unique [qualified names](#QualifiedName), so
+identifiers that are used to name types MUST be unique within a
+namespace to prevent ambiguity.
+
+Names are case-sensitive, but service authors SHOULD NOT choose names
+that differ only in case.
+
+The namespace MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+
+::: {.varxml .rep}
+### <a name="ElementedmSchema5" href="#ElementedmSchema5"> Element `edm:Schema`</a>
+
+The `edm:Schema` element defines a
+schema. It MUST contain the `Namespace` attribute and it MAY
+contain the `Alias` attribute.
+
+It MAY contain elements [`edm:Action`](#Action),
+[`edm:Annotations`](#AnnotationswithExternalTargeting),
+[`edm:Annotation`](#Annotation), [`edm:ComplexType`](#ComplexType),
+[`edm:EntityContainer`](#EntityContainer),
+[`edm:EntityType`](#EntityType), [`edm:EnumType`](#EnumerationType),
+[`edm:Function`](#Function), [`edm:Term`](#Term), or
+[`edm:TypeDefinition`](#TypeDefinition).
+
+### <a name="AttributeNamespace5.1" href="#AttributeNamespace5.1"> Attribute `Namespace`</a>
+
+The value of `Namespace` is the namespace of the schema
+:::
+
+## <a name="Alias" href="#Alias">5.1 Alias</a>
+
+A schema MAY specify an alias which MUST be a [simple
+identifier](#SimpleIdentifier).
+
+
+::: varxml
+If a schema specifies an alias, the alias MAY be used instead of the
+namespace within qualified names to identify model elements of that
+schema. An alias only provides a more convenient notation, allowing a
+short string to be substituted for a long namespace. Every model element
+that can be identified via an alias-qualified name can alternatively be
+identified via its full namespace-qualified name.
+:::
+
+Aliases are document-global, so all schemas defined within or included
+into a document MUST have different aliases, and aliases MUST differ
+from the namespaces of all schemas defined within or included into a
+document. Aliases defined by a schema can be used throughout the
+containing document and are not restricted to the schema that defines
+them.
+
+The alias MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+
+
+::: {.varxml .rep}
+### <a name="AttributeAlias5.2" href="#AttributeAlias5.2"> Attribute `Alias`</a>
+
+The value of `Alias` is a [simple identifier](#SimpleIdentifier).
+:::
+
+::: {.varxml .example}
+Example 6: schema `org.example` with an alias and a description for the
+schema
+```xml
+<Schema Namespace="org.example" Alias="self">   <Annotation Term="Core.Description" String="Example schema" />
+  ...
+</Schema>
+```
+:::
+
+## <a name="AnnotationswithExternalTargeting" href="#AnnotationswithExternalTargeting">5.2 Annotations with External Targeting</a>
+
+
+
+::: {.varxml .rep}
+### <a name="ElementedmAnnotations6" href="#ElementedmAnnotations6"> Element `edm:Annotations`</a>
+
+The `edm:Annotations` element is used to apply a group of annotations to
+a single model element. It MUST contain the `Target` attribute and it
+MAY contain the `Qualifier` attribute.
+
+It MUST contain at least one [`edm:Annotation`](#Annotation) element.
+
+### <a name="AttributeTarget6.1" href="#AttributeTarget6.1"> Attribute `Target`</a>
+
+The value of `Target` is a path expression identifying the [annotation
+target](#Target). It MUST resolve to a model element in scope.
+
+### <a name="AttributeQualifier6.2" href="#AttributeQualifier6.2"> Attribute `Qualifier`</a>
+
+The value of `Qualifier` is a [simple identifier](#SimpleIdentifier).
+:::
+
+::: {.varxml .example}
+Example 7: annotations should only be applied to tablet devices
+```xml
+<Annotations Target="org.example.Person" Qualifier="Tablet">
+  <Annotation Term="Core.Description" String="Dummy" />
+  ...
+</Annotations>
+```
+:::
+
+-------
+
 # <a name="References" href="#References">Appendix A. References</a>
 
 <!-- Required section -->
@@ -818,43 +945,20 @@ While any hyperlinks included in this appendix were valid at the time of publica
 
 The following documents are referenced in such a way that some or all of their content constitutes requirements of this document.
 
-`(Reference sources:
-For references to IETF RFCs, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/ietf-rfc-list/ietf-rfc-list.html.  
-For references to W3C Recommendations, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/w3c-recommendations-list/w3c-recommendations-list.html.  
-Remove this note before submitting for publication.)`
-
 ###### [OData-v4.02]
 - _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
   - _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
   - _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
 
-###### <a name="rfc2119">[RFC2119]</a>
-_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
-http://www.rfc-editor.org/info/rfc2119.
-
-###### <a name="rfc8174">[RFC8174]</a>
-_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
-http://www.rfc-editor.org/info/rfc8174.
-
-###### <a name="rfc6570">[RFC6570]</a>
-_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
-http://tools.ietf.org/html/rfc6570.
-
-###### <a name="rfc7493">[RFC7493]</a>
-_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
-https://tools.ietf.org/html/rfc7493.
-
-###### <a name="rfc8259">[RFC8259]</a>
-_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
-http://tools.ietf.org/html/rfc8259.
-
 ###### <a name="ECMAScript">[ECMAScript]</a>
 _ECMAScript 2016 Language Specification, 7th Edition_. June 2016. Standard ECMA-262. http://www.ecma-international.org/publications/standards/Ecma-262.htm.
 
 ###### <a name="EPSG">[EPSG]</a>
-_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.
+_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.###### <a name="rfc7493">[RFC7493]</a>
+_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
+https://tools.ietf.org/html/rfc7493.###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+http://www.rfc-editor.org/info/rfc2119.
 
 ###### <a name="ODataABNF">[OData-ABNF]</a>
 _OData ABNF Construction Rules Version 4.01_.  
@@ -864,10 +968,22 @@ See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page
 _OData CSDL JSON Schema_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataCSDLJSON">[OData-CSDLJSON]</a>
+_OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01_.  
+See link in "[Related work](#RelatedWork)" section on cover page.
+
 ###### <a name="ODataCSDLXML">[OData-CSDLXML]</a>
 _OData Common Schema Definition Language (CSDL) XML Representation Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataEDM">[OData-EDM]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
+###### <a name="ODataEDMX">[OData-EDMX]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
 ###### <a name="ODataJSON">[OData-JSON]</a>
 _OData JSON Format Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
@@ -890,18 +1006,43 @@ See link in "[Related work](#RelatedWork)" section on cover page.
 
 ###### <a name="ODataVocValidation">[OData-VocValidation]</a>
 _OData Vocabularies Version 4.0: Validation Vocabulary_.  
-See link in "[Related work](#RelatedWork)" section on cover page.
+See link in "[Related work](#RelatedWork)" section on cover page.###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
 
-###### <a name="XMLSchema">[XML-Schema-2]</a>
+###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+https://www.rfc-editor.org/info/rfc2119.
+
+###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, “URI Template”, RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
+
+###### <a name="rfc8174">[RFC8174]</a>
+_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
+http://www.rfc-editor.org/info/rfc8174.
+
+###### <a name="rfc8259">[RFC8259]</a>
+_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
+http://tools.ietf.org/html/rfc8259.
+
+###### <a name="XML11">[XML-1.1]</a>
+_Extensible Markup Language (XML) 1.1 (Second Edition)_. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.  
+http://www.w3.org/TR/2006/REC-xml11-20060816. Latest version available at http://www.w3.org/TR/xml11/.
+
+###### <a name="XMLBase">[XML-Base]</a>
+_XML Base (Second Edition)_. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.  
+http://www.w3.org/TR/2009/REC-xmlbase-20090128/. Latest version available at http://www.w3.org/TR/xmlbase/. 
+###### <a name="XMLSchema1">[XML-Schema-1]</a>
+_W3C XML Schema Definition Language (XSD) 1.1 Part 1: Structures_. D. Beech, M. Maloney, C. M. Sperberg-McQueen, H. S. Thompson, S. Gao, N. Mendelsohn, Editors, W3C Recommendation, 5 April 2012.  
+http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-1/.
+
+###### <a name="XMLSchema2">[XML-Schema-2]</a>
 _W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes_. D. Peterson, S. Gao, C. M. Sperberg-McQueen, H. S. Thompson, P. V. Biron, A. Malhotra, Editors, W3C Recommendation, 5 April 2012.  
 http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-2/.
 
 ## <a name="InformativeReferences" href="#InformativeReferences">A.2 Informative References</a>
 
-###### <a name="rfc3552">[RFC3552]</a>
-_Rescorla, E. and B. Korver, "Guidelines for Writing RFC Text on Security Considerations", BCP 72, RFC 3552, DOI 10.17487/RFC3552, July 2003_
-https://www.rfc-editor.org/info/rfc3552.
-
 ###### <a name="OpenUI5">[OpenUI5]</a>
 _OpenUI5 Version 1.40.10 - OData V4 Metadata JSON Format_.  
 https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html.
@@ -923,6 +1064,12 @@ https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a4
   - [Attribute `TermNamespace`](#AttributeTermNamespace4.1)
   - [Attribute `Qualifier`](#AttributeQualifier4.2)
   - [Attribute `TargetNamespace`](#AttributeTargetNamespace4.3)
+- [Element `edm:Schema`](#ElementedmSchema5)
+  - [Attribute `Namespace`](#AttributeNamespace5.1)
+  - [Attribute `Alias`](#AttributeAlias5.2)
+- [Element `edm:Annotations`](#ElementedmAnnotations6)
+  - [Attribute `Target`](#AttributeTarget6.1)
+  - [Attribute `Qualifier`](#AttributeQualifier6.2)
 :::
 
 -------
diff --git a/docs/odata-csdl-xml/styles/odata.css b/docs/odata-csdl-xml/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-csdl-xml/styles/odata.css
+++ b/docs/odata-csdl-xml/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/docs/odata-data-aggregation-ext/styles/odata.css b/docs/odata-data-aggregation-ext/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-data-aggregation-ext/styles/odata.css
+++ b/docs/odata-data-aggregation-ext/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/docs/odata-json-format/styles/odata.css b/docs/odata-json-format/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-json-format/styles/odata.css
+++ b/docs/odata-json-format/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/docs/odata-protocol/styles/odata.css b/docs/odata-protocol/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-protocol/styles/odata.css
+++ b/docs/odata-protocol/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/docs/odata-url-conventions/styles/odata.css b/docs/odata-url-conventions/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/docs/odata-url-conventions/styles/odata.css
+++ b/docs/odata-url-conventions/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }
diff --git a/odata-csdl-json/0 frontmatter.md b/odata-csdl-json/0 frontmatter.md
index e7ae7129c..b71a0a9f8 100644
--- a/odata-csdl-json/0 frontmatter.md	
+++ b/odata-csdl-json/0 frontmatter.md	
@@ -40,7 +40,7 @@ Heiko Theißen (heiko.theissen@sap.com), [SAP SE](http://www.sap.com/)
 
 #### <a name="AdditionalArtifacts">Additional artifacts:</a>
 This prose specification is one component of a Work Product that also includes:
-* XML schemas: (list file names or directory name)
+* XML schemas: _OData EDMX XML Schema and OData EDM XML Schema_. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/os/schemas/
 * Other parts (list titles and/or file names)
 * `(Note: Any normative computer language definitions that are part of the Work Product, such as XML instances, schemas and Java(TM) code, including fragments of such, must be (a) well formed and valid, (b) provided in separate plain text files, (c) referenced from the Work Product; and (d) where any definition in these separate files disagrees with the definition found in the specification, the definition in the separate file prevails. Remove this note before submitting for publication.)`
 
@@ -50,8 +50,17 @@ This specification replaces or supersedes:
 
 This specification is related to:
 * _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
-  * _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
-  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _OData Version 4.02 Part 1: Protocol_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
+  * _OData Version 4.02 Part 2: URL Conventions_. Latest stage: https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
+  * _ABNF components: OData ABNF Construction Rules Version 4.01 and OData ABNF Test Cases_. https://docs.oasis-open.org/odata/odata/v4.01/os/abnf/
+* _OData Vocabularies Version 4.0_. Edited by Michael Pizzo, Ralf Handl, and Ram Jeyaraman. Latest stage: https://docs.oasis-open.org/odata/odata-vocabularies/v4.0/odata-vocabularies-v4.0.html
+: varxml
+* _OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01_. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-json/v4.01/odata-csdl-json-v4.01.html
+:
+: varjson
+* _OData Common Schema Definition Language (CSDL) XML Representation Version 4.01_. Edited by Michael Pizzo, Ralf Handl, and Martin Zurmuehl. Latest stage: https://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html
+:
+* _OData JSON Format Version 4.01_. Edited by Ralf Handl, Mike Pizzo, and Mark Biamonte. Latest stage: https://docs.oasis-open.org/odata/odata-json-format/v4.01/odata-json-format-v4.01.html
 
 #### Abstract:
 OData services are described by an Entity Model (EDM). The Common Schema Definition Language (CSDL) defines specific representations of the entity data model exposed by an OData service, using XML, JSON, and other formats. This document (OData CSDL JSON Representation) specifically defines the JSON representation of CSDL.
diff --git a/odata-csdl-json/1 Introduction.md b/odata-csdl-json/1 Introduction.md
index 196e13337..94295bb1e 100644
--- a/odata-csdl-json/1 Introduction.md	
+++ b/odata-csdl-json/1 Introduction.md	
@@ -221,7 +221,7 @@ they have the default value.
 ## ##subsec JSON Schema Definition
 
 The structure of CSDL JSON documents can be verified with the JSON
-Schema [OData-CSDL-Schema](#CSDLschema) provided as an
+Schema [OData-CSDL-Schema](#ODataCSDL) provided as an
 additional artifact of this prose specification. This schema only
 defines the shape of a well-formed CSDL JSON document but is not
 descriptive enough to define what a correct CSDL JSON document MUST be
@@ -236,13 +236,13 @@ this specification document take precedence.
 
 OData CSDL XML is a full representation of the OData Common Schema
 Definition Language in the Extensible Markup Language (XML) 1.1 (Second
-Edition) [XML-1.1](#BMXML) with further building blocks from the
+Edition) [XML-1.1](#XML11) with further building blocks from the
 W3C XML Schema Definition Language (XSD) 1.1 as described in
-[XML-Schema-1](#BMXMLSchema1) and
-[XML-Schema-2](#BMXMLSchema2).
+[XML-Schema-1](#XMLSchema1) and
+[XML-Schema-2](#XMLSchema2).
 
 It is an alternative to the CSDL JSON representation defined in
-[OData-CSDLJSON](#BMCSDLJSON) and neither adds nor
+[OData-CSDLJSON](#ODataCSDLJSON) and neither adds nor
 removes features.
 
 ## ##subsec Requesting the XML Representation
@@ -312,8 +312,8 @@ prescriptive.
 ## ##subsec XML Schema Definitions
 
 This specification contains normative XML schemas for the EDMX and EDM
-namespaces; see [OData-EDMX](#BMEDMX) and
-[OData-EDM](#BMEDM)
+namespaces; see [OData-EDMX](#ODataEDMX) and
+[OData-EDM](#ODataEDM)
 
 These XML schemas only define the shape of a well-formed CSDL XML
 document and are not descriptive enough to define what a correct CSDL
@@ -443,7 +443,7 @@ Type|Meaning
 `Edm.GeometryCollection`         |Collection of arbitrary Geometry values
 
 `Edm.Date` and `Edm.DateTimeOffset` follow
-[XML-Schema-2](#XMLSchema) and use the proleptic Gregorian
+[XML-Schema-2](#XMLSchema2) and use the proleptic Gregorian
 calendar, allowing the year `0000` (equivalent to 1 BCE) and negative
 years (year `-0001` being equivalent to 2 BCE etc.). The supported date
 range is service-specific and typically depends on the underlying
diff --git a/odata-csdl-json/4 CSDL JSON Document.md b/odata-csdl-json/4 CSDL Document.md
similarity index 100%
rename from odata-csdl-json/4 CSDL JSON Document.md
rename to odata-csdl-json/4 CSDL Document.md
diff --git a/odata-csdl-json/5 Schema.md b/odata-csdl-json/5 Schema.md
new file mode 100644
index 000000000..0b15f6396
--- /dev/null
+++ b/odata-csdl-json/5 Schema.md	
@@ -0,0 +1,186 @@
+-------
+
+# ##sec Schema
+
+One or more schemas describe the entity model exposed by an OData
+service. The schema acts as a namespace for elements of the entity model
+such as entity types, complex types, enumerations and terms.
+
+A schema is identified by a [namespace](#Namespace). Schema namespaces
+MUST be unique within the scope of a document and SHOULD be globally
+unique. A schema cannot span more than one document.
+
+The schema's namespace is combined with the name of elements in the
+schema to create unique [qualified names](#QualifiedName), so
+identifiers that are used to name types MUST be unique within a
+namespace to prevent ambiguity.
+
+Names are case-sensitive, but service authors SHOULD NOT choose names
+that differ only in case.
+
+The namespace MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+::: {.varjson .rep}
+### ##isec Schema Object
+
+A schema is represented as a member of the document object whose name is
+the schema namespace. Its value is an object that MAY contain the
+members [`$Alias`](#Alias) and
+[`$Annotations`](#AnnotationswithExternalTargeting).
+
+The schema object MAY contain members representing [entity
+types](#EntityType), [complex types](#ComplexType), [enumeration
+types](#EnumerationType), [type definitions](#TypeDefinition),
+[actions](#Action), [functions](#Function), [terms](#Term), and an
+[entity container](#EntityContainer).
+
+The schema object MAY also contain [annotations](#Annotation) that apply
+to the schema itself.
+:::
+
+::: {.varxml .rep}
+### ##isec Element `edm:Schema`
+
+The `edm:Schema` element defines a
+schema. It MUST contain the `Namespace` attribute and it MAY
+contain the `Alias` attribute.
+
+It MAY contain elements [`edm:Action`](#Action),
+[`edm:Annotations`](#AnnotationswithExternalTargeting),
+[`edm:Annotation`](#Annotation), [`edm:ComplexType`](#ComplexType),
+[`edm:EntityContainer`](#EntityContainer),
+[`edm:EntityType`](#EntityType), [`edm:EnumType`](#EnumerationType),
+[`edm:Function`](#Function), [`edm:Term`](#Term), or
+[`edm:TypeDefinition`](#TypeDefinition).
+
+### ##subisec Attribute `Namespace`
+
+The value of `Namespace` is the namespace of the schema
+:::
+
+## ##subsec Alias
+
+A schema MAY specify an alias which MUST be a [simple
+identifier](#SimpleIdentifier).
+
+::: varjson
+If a schema specifies an alias, the alias MUST be used instead of the
+namespace within qualified names throughout the document to identify
+model elements of that schema. A mixed use of namespace-qualified names
+and alias-qualified names is not allowed.
+:::
+
+::: varxml
+If a schema specifies an alias, the alias MAY be used instead of the
+namespace within qualified names to identify model elements of that
+schema. An alias only provides a more convenient notation, allowing a
+short string to be substituted for a long namespace. Every model element
+that can be identified via an alias-qualified name can alternatively be
+identified via its full namespace-qualified name.
+:::
+
+Aliases are document-global, so all schemas defined within or included
+into a document MUST have different aliases, and aliases MUST differ
+from the namespaces of all schemas defined within or included into a
+document. Aliases defined by a schema can be used throughout the
+containing document and are not restricted to the schema that defines
+them.
+
+The alias MUST NOT be one of the reserved values `Edm`, `odata`,
+`System`, or `Transient`.
+
+::: {.varjson .rep}
+### ##subisec `$Alias`
+
+The value of `$Alias` is a string containing the alias for the schema.
+:::
+
+::: {.varjson .example}
+Example ##ex: document defining a schema `org.example` with an alias and a
+description for the schema
+```json
+{
+  ...
+  "org.example": {
+    "$Alias": "self",
+    "@Core.Description": "Example schema",
+    ...
+  },
+  ...
+}
+```
+:::
+
+::: {.varxml .rep}
+### ##subisec Attribute `Alias`
+
+The value of `Alias` is a [simple identifier](#SimpleIdentifier).
+:::
+
+::: {.varxml .example}
+Example ##ex: schema `org.example` with an alias and a description for the
+schema
+```xml
+<Schema Namespace="org.example" Alias="self">
+  <Annotation Term="Core.Description" String="Example schema" />
+  ...
+</Schema>
+```
+:::
+
+## ##subsec Annotations with External Targeting
+
+::: {.varjson .rep}
+### ##subisec `$Annotations`
+
+The value of `$Annotations` is an object with one member per [annotation
+target](#Target). The member name is a path identifying the [annotation
+target](#Target), the member value is an object containing
+[annotations](#Annotation) for that target.
+:::
+
+::: {.varjson .example}
+Example ##ex: annotations targeting the `Person` type with qualifier
+`Tablet`
+```json
+"org.example": {
+  "$Alias": "self",
+  "$Annotations": {
+    "self.Person": {
+      "@Core.Description#Tablet": "Dummy",
+      ...
+    }
+  }
+},
+```
+:::
+
+::: {.varxml .rep}
+### ##isec Element `edm:Annotations`
+
+The `edm:Annotations` element is used to apply a group of annotations to
+a single model element. It MUST contain the `Target` attribute and it
+MAY contain the `Qualifier` attribute.
+
+It MUST contain at least one [`edm:Annotation`](#Annotation) element.
+
+### ##subisec Attribute `Target`
+
+The value of `Target` is a path expression identifying the [annotation
+target](#Target). It MUST resolve to a model element in scope.
+
+### ##subisec Attribute `Qualifier`
+
+The value of `Qualifier` is a [simple identifier](#SimpleIdentifier).
+:::
+
+::: {.varxml .example}
+Example ##ex: annotations should only be applied to tablet devices
+```xml
+<Annotations Target="org.example.Person" Qualifier="Tablet">
+  <Annotation Term="Core.Description" String="Dummy" />
+  ...
+</Annotations>
+```
+:::
diff --git a/odata-csdl-json/Appendix.md b/odata-csdl-json/Appendix.md
index 012c99c08..3b36bd4f4 100644
--- a/odata-csdl-json/Appendix.md
+++ b/odata-csdl-json/Appendix.md
@@ -12,43 +12,20 @@ While any hyperlinks included in this appendix were valid at the time of publica
 
 The following documents are referenced in such a way that some or all of their content constitutes requirements of this document.
 
-`(Reference sources:
-For references to IETF RFCs, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/ietf-rfc-list/ietf-rfc-list.html.  
-For references to W3C Recommendations, use the approved citation formats at:  
-https://docs.oasis-open.org/templates/w3c-recommendations-list/w3c-recommendations-list.html.  
-Remove this note before submitting for publication.)`
-
 ###### [OData-v4.02]
 - _OData Version 4.02_. Edited by Michael Pizzo, Ralf Handl, and Heiko Theißen. A multi-part Work Product that includes:
   - _OData Version 4.02 Part 1: Protocol_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part1-protocol.html
   - _OData Version 4.02 Part 2: URL Conventions_. Latest stage. https://docs.oasis-open.org/odata/odata/v4.02/odata-v4.02-part2-url-conventions.html
 
-###### <a name="rfc2119">[RFC2119]</a>
-_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
-http://www.rfc-editor.org/info/rfc2119.
-
-###### <a name="rfc8174">[RFC8174]</a>
-_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
-http://www.rfc-editor.org/info/rfc8174.
-
-###### <a name="rfc6570">[RFC6570]</a>
-_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
-http://tools.ietf.org/html/rfc6570.
-
-###### <a name="rfc7493">[RFC7493]</a>
-_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
-https://tools.ietf.org/html/rfc7493.
-
-###### <a name="rfc8259">[RFC8259]</a>
-_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
-http://tools.ietf.org/html/rfc8259.
-
 ###### <a name="ECMAScript">[ECMAScript]</a>
 _ECMAScript 2016 Language Specification, 7th Edition_. June 2016. Standard ECMA-262. http://www.ecma-international.org/publications/standards/Ecma-262.htm.
 
 ###### <a name="EPSG">[EPSG]</a>
-_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.
+_European Petroleum Survey Group (EPSG)_. http://www.epsg.org/.###### <a name="rfc7493">[RFC7493]</a>
+_Bray, T., Ed., "The I-JSON Message Format", RFC7493, March 2015_.  
+https://tools.ietf.org/html/rfc7493.###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+http://www.rfc-editor.org/info/rfc2119.
 
 ###### <a name="ODataABNF">[OData-ABNF]</a>
 _OData ABNF Construction Rules Version 4.01_.  
@@ -58,10 +35,22 @@ See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page
 _OData CSDL JSON Schema_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataCSDLJSON">[OData-CSDLJSON]</a>
+_OData Common Schema Definition Language (CSDL) JSON Representation Version 4.01_.  
+See link in "[Related work](#RelatedWork)" section on cover page.
+
 ###### <a name="ODataCSDLXML">[OData-CSDLXML]</a>
 _OData Common Schema Definition Language (CSDL) XML Representation Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
 
+###### <a name="ODataEDM">[OData-EDM]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
+###### <a name="ODataEDMX">[OData-EDMX]</a>
+_OData EDM XML Schema_.  
+See link in "[Additional artifacts](#AdditionalArtifacts)" section on cover page.
+
 ###### <a name="ODataJSON">[OData-JSON]</a>
 _OData JSON Format Version 4.01_.  
 See link in "[Related work](#RelatedWork)" section on cover page.
@@ -84,18 +73,44 @@ See link in "[Related work](#RelatedWork)" section on cover page.
 
 ###### <a name="ODataVocValidation">[OData-VocValidation]</a>
 _OData Vocabularies Version 4.0: Validation Vocabulary_.  
-See link in "[Related work](#RelatedWork)" section on cover page.
+See link in "[Related work](#RelatedWork)" section on cover page.###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, "URI Template", RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
+
+###### <a name="rfc2119">[RFC2119]</a>
+_Bradner, S., "Key words for use in RFCs to Indicate Requirement Levels", BCP 14, RFC 2119, DOI 10.17487/RFC2119, March 1997_.  
+https://www.rfc-editor.org/info/rfc2119.
+
+###### <a name="rfc6570">[RFC6570]</a>
+_Gregorio, J., Fielding, R., Hadley, M., Nottingham, M., and D. Orchard, “URI Template”, RFC 6570, March 2012_.  
+http://tools.ietf.org/html/rfc6570.
 
-###### <a name="XMLSchema">[XML-Schema-2]</a>
+###### <a name="rfc8174">[RFC8174]</a>
+_Leiba, B., "Ambiguity of Uppercase vs Lowercase in RFC 2119 Key Words", BCP 14, RFC 8174, DOI 10.17487/RFC8174, May 2017_.  
+http://www.rfc-editor.org/info/rfc8174.
+
+###### <a name="rfc8259">[RFC8259]</a>
+_Bray, T., Ed., "The JavaScript Object Notation (JSON) Data Interchange Format", RFC 8259, December 2017_.  
+http://tools.ietf.org/html/rfc8259.
+
+###### <a name="XML11">[XML-1.1]</a>
+_Extensible Markup Language (XML) 1.1 (Second Edition)_. F. Yergeau, E. Maler, J. Cowan, T. Bray, C. M. Sperberg-McQueen, J. Paoli, Editors, W3C Recommendation, 16 August 2006.  
+http://www.w3.org/TR/2006/REC-xml11-20060816. Latest version available at http://www.w3.org/TR/xml11/.
+
+###### <a name="XMLBase">[XML-Base]</a>
+_XML Base (Second Edition)_. J. Marsh, R. Tobin, Editors, W3C Recommendation, 28 January 2009.  
+http://www.w3.org/TR/2009/REC-xmlbase-20090128/. Latest version available at http://www.w3.org/TR/xmlbase/. 
+
+###### <a name="XMLSchema1">[XML-Schema-1]</a>
+_W3C XML Schema Definition Language (XSD) 1.1 Part 1: Structures_. D. Beech, M. Maloney, C. M. Sperberg-McQueen, H. S. Thompson, S. Gao, N. Mendelsohn, Editors, W3C Recommendation, 5 April 2012.  
+http://www.w3.org/TR/2012/REC-xmlschema11-1-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-1/.
+
+###### <a name="XMLSchema2">[XML-Schema-2]</a>
 _W3C XML Schema Definition Language (XSD) 1.1 Part 2: Datatypes_. D. Peterson, S. Gao, C. M. Sperberg-McQueen, H. S. Thompson, P. V. Biron, A. Malhotra, Editors, W3C Recommendation, 5 April 2012.  
 http://www.w3.org/TR/2012/REC-xmlschema11-2-20120405/. Latest version available at http://www.w3.org/TR/xmlschema11-2/.
 
 ## ##subasec Informative References
 
-###### <a name="rfc3552">[RFC3552]</a>
-_Rescorla, E. and B. Korver, "Guidelines for Writing RFC Text on Security Considerations", BCP 72, RFC 3552, DOI 10.17487/RFC3552, July 2003_
-https://www.rfc-editor.org/info/rfc3552.
-
 ###### <a name="OpenUI5">[OpenUI5]</a>
 _OpenUI5 Version 1.40.10 - OData V4 Metadata JSON Format_.  
 https://openui5.hana.ondemand.com/1.40.10/#docs/guide/87aac894a40640f89920d7b2a414499b.html.
diff --git a/styles/odata.css b/styles/odata.css
index 016fcf7f0..a3cafde6b 100644
--- a/styles/odata.css
+++ b/styles/odata.css
@@ -3,18 +3,21 @@ a:target {
 }
 
 a[href^="#OData"],
-a[href^="#rfc"] {
+a[href^="#rfc"],
+a[href^="#XML"] {
 	font-weight: bold;
 }
 
 a[href^="#OData"]::before,
-a[href^="#rfc"]::before {
+a[href^="#rfc"]::before,
+a[href^="#XML"]::before {
 	content: "[";
 	font-weight: bold;
 }
 
 a[href^="#OData"]::after,
-a[href^="#rfc"]::after {
+a[href^="#rfc"]::after,
+a[href^="#XML"]::after {
 	content: "]";
 	font-weight: bold;
 }