diff --git a/spec/latest/common/common.js b/spec/latest/common/common.js
index 5d054240a..ddc2c8d22 100644
--- a/spec/latest/common/common.js
+++ b/spec/latest/common/common.js
@@ -173,7 +173,7 @@ function updateExample(doc, content) {
   // perform transformations to make it render and prettier
   content = unComment(doc, content);
   content = _esc(content);
-  content = content.replace(/\*\*\*\*([^*]*)\*\*\*\*/g, '<span class="highlight">$1</span>');
+  content = content.replace(/\*\*\*\*([^*]*)\*\*\*\*/g, '<span class="hl-bold">$1</span>');
   content = content.replace(/####([^#]*)####/g, '<span class="comment">$1</span>');
   return content ;
 }
diff --git a/spec/latest/common/terms.html b/spec/latest/common/terms.html
index 0d1e9a3e3..f52c9e912 100644
--- a/spec/latest/common/terms.html
+++ b/spec/latest/common/terms.html
@@ -4,7 +4,7 @@ <h1>General Terminology</h1>
   <p>This document uses the following terms as defined in JSON [[!RFC7159]]. Refer
     to the <a data-cite="RFC7159#section-2">JSON Grammar section</a> in [[!RFC7159]] for formal definitions.</p>
 
-  <dl class="termlist">
+  <dl class="termlist" data-sort>
     <dt><dfn data-lt="arrays">array</dfn></dt><dd>
       In the JSON serialization, an array structure is represented as square brackets surrounding zero
       or more values. Values are separated by commas.
@@ -59,7 +59,7 @@ <h1>General Terminology</h1>
 
   <p>Furthermore, the following terminology is used throughout this document:</p>
 
-  <dl class="termlist">
+  <dl class="termlist" data-sort>
     <dt><dfn data-lt="absolute IRIs">absolute IRI</dfn></dt><dd>
       An <a data-cite="RFC3987#section-1.3" class="externalDFN">absolute IRI</a> is defined in [[!RFC3987]] containing a <em>scheme</em> along with a <em>path</em> and
       optional <em>query</em> and fragment segments.</dd>
@@ -94,7 +94,9 @@ <h1>General Terminology</h1>
       if a <a>named graph</a> is not specified.</dd>
     <dt><dfn>default language</dfn></dt><dd>
       The default language is set in the <a>context</a> using the <code>@language</code> key whose
-      value MUST be a <a>string</a> representing a [[!BCP47]] language code or <code>null</code>.</dd>
+      value MUST be a <a>string</a> representing a [[!BCP47]] language code or <code>null</code>.
+      <span class="ednote">From <a href="#issue-480">Issue 480</a>
+      the language tag <code>@none</code> represents no language.</span></dd>
     <dt><dfn>default object</dfn></dt><dd>
       A <a>default object</a> is a <a>JSON object</a> that has a <code>@default</code> member.</dd>
     <dt><dfn data-lt="edges">edge</dfn></dt><dd>
@@ -122,6 +124,16 @@ <h1>General Terminology</h1>
       of the associated <a>node object</a>; value MUST be a <a>node object</a>.
       If the value contains a property expanding to <code>@id</code>, it's value MUST
       be equivalent to the referencing key.</dd>
+    <dt class="changed"><dfn data-lt="graph objects">graph object</dfn></dt><dd class="changed">
+      A <a>graph object</a> represents a <a>named graph</a> represented as the
+      value of a <a>property</a> within a <a>node object</a>. When expanded, a
+      graph object MUST have an <code>@graph</code> member, and may also have
+      <code>@context</code>, <code>@id</code>, and <code>@index</code> members.
+      A <dfn class="preserve" data-lt="simple graph objects">simple graph object</dfn> is a
+      <a>graph object</a> which does not have an <code>@id</code> member. Note
+      that <a>node objects</a> may have a <code>@graph</code> member, but are
+      not considered <a>graph objects</a> if they include any other properties.
+      A top-level object consisting of <code>@graph</code> is also not a <a>graph object</a>.</dd>
    <dt><dfn data-lt="index maps">index map</dfn></dt><dd>
     An <a>index map</a> is a <a>JSON object</a> value of a <a>term</a> defined with
     <code>@container</code> set to <code>@index</code>, whose values MUST be any of the following types:
@@ -186,7 +198,10 @@ <h1>General Terminology</h1>
       A <a>context</a> that is specified within a <a>JSON object</a>,
       specified via the <code>@context</code> <a>keyword</a>.</dd>
     <dt><dfn data-lt="named graphs">named graph</dfn></dt><dd>
-      A <a data-cite="RDF11-CONCEPTS#dfn-named-graph" class="externalDFN">named graph</a> is a <a>linked data graph</a> that is identified by an <a>IRI</a> or <a>blank node</a>
+      A <a data-cite="RDF11-CONCEPTS#dfn-named-graph" class="externalDFN">named graph</a> is a <a>linked data graph</a> that is identified by an <a>IRI</a> or <a>blank node</a>.</dd>
+    <dt><dfn data-lt="implicitly named graphs">implicitly named graph</dfn></dt><dd>
+      A <a>named graph</a> created from the value of a property having an
+      <a>expanded term definition</a> where <code>@container</code> is set to  <code>@graph</code>.</dd>
     <dt><dfn data-lt="nested properties">nested property</dfn></dt><dd>
       A <a>nested property</a> is a <a>property</a> which is contained within an object referenced by
       a semantically meaningless <em>nesting property</em>.
@@ -283,7 +298,7 @@ <h1>Algorithm Terms</h1>
 
   <p>The Following terms are used within specific algorithms.</p>
 
-  <dl class="termlist">
+  <dl class="termlist" data-sort>
     <dt><dfn>active context</dfn></dt><dd>
       A <a>context</a> that is used to resolve <a>terms</a> while the processing
       algorithm is running.</dd>
diff --git a/spec/latest/json-ld-api/index.html b/spec/latest/json-ld-api/index.html
index bc220fa52..4455bb69f 100644
--- a/spec/latest/json-ld-api/index.html
+++ b/spec/latest/json-ld-api/index.html
@@ -89,7 +89,7 @@
 //]]>
 </script>
 <style type="text/css">
-  .highlight {
+  .hl-bold {
     font-weight: bold;
     color: #0a3;
   }
@@ -212,7 +212,7 @@ <h3>Example Conventions</h3>
       the internal representation use of <a>dictionaries</a> are represented using
       <a>JSON objects</a>.</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample JSON-LD document">
     <!--
     {
@@ -300,7 +300,7 @@ <h2>Expansion</h2>
       here is an example of JSON-LD that uses only <a>terms</a>
       and is fairly compact:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample JSON-LD document">
     <!--
     {
@@ -322,7 +322,7 @@ <h2>Expansion</h2>
     and an <a>array</a> to encapsulate another, but
     leaves the rest of the information untouched.</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample JSON-LD document using an IRI instead of a term to express a property">
     <!--
     {
@@ -354,7 +354,7 @@ <h2>Expansion</h2>
       (<a data-link-for="JsonLdProcessor">expand</a>)
       operation) against the above examples results in the following output:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Expanded sample document">
     <!--
     [
@@ -407,7 +407,7 @@ <h2>Compaction</h2>
 
     <p>For example, assume the following expanded JSON-LD input document:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Expanded sample document">
     <!--
     [
@@ -427,7 +427,7 @@ <h2>Compaction</h2>
     <p>Additionally, assume the following developer-supplied JSON-LD
       <a>context</a>:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="JSON-LD context">
     <!--
     {
@@ -447,7 +447,7 @@ <h2>Compaction</h2>
       operation) given the context supplied above against the JSON-LD input
       document provided above would result in the following output:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Compacted sample document">
     <!--
     {
@@ -494,7 +494,7 @@ <h2>Flattening</h2>
 
     <p>For example, assume the following JSON-LD input document:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample JSON-LD document">
     <!--
     {
@@ -518,7 +518,7 @@ <h2>Flattening</h2>
       operation) with a context set to <a>null</a> to prevent compaction
       returns the following document:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Flattened sample document in expanded form">
     <!--
     [
@@ -555,7 +555,7 @@ <h2>Flattening</h2>
       the same context as the input document, the flattened and compacted document
       looks as follows:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Flattened and compacted sample document">
     <!--
     {
@@ -593,7 +593,7 @@ <h2>RDF Serialization/Deserialization</h2>
 
     <p>For example, assume the following RDF input serialized in Turtle [[TURTLE]]:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample Turtle document">
     <!--
     <http://me.markus-lanthaler.com/> <http://xmlns.com/foaf/0.1/name> "Markus Lanthaler" .
@@ -604,7 +604,7 @@ <h2>RDF Serialization/Deserialization</h2>
     <p>Using the <a href="#serialize-rdf-as-json-ld-algorithm">Serialize RDF as JSON-LD algorithm</a>
       a developer could transform this document into expanded JSON-LD:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample Turtle document converted to JSON-LD">
     <!--
     [
@@ -1074,20 +1074,27 @@ <h3>Algorithm</h3>
           <ol class="algorithm">
             <li>Initialize <em>container</em> to the value associated with the
               <code>@container</code> key, which must be either
-              <code>@list</code>, <code>@set</code>, <code>@index</code>,
-              <span class="changed"><code>@id</code>, <code>@type</code></span>
-              or <code>@language</code>,
+              <span class="changed"><code>@graph</code>,
+              <span class="changed"><code>@id</code>,
+              <code>@index</code>,
+              <code>@language</code>.
+              <code>@list</code>,
+              <code>@set</code>, or
+              <code>@type</code></span>.
               <span class="changed">
-                or an <a>array</a> containing exactly any one of those keywords,
-                or a combination of <code>@set</code> and any of <code>@index</code>,
-                <code>@id</code>, <code>@type</code>, <code>@language</code>
-                in any order
+                or an <a>array</a> containing exactly any one of those
+                keywords, an <a>array</a> containing <code>@graph</code> and
+                either <code>@id</code> or <code>@index</code> optionally
+                including <code>@set</code>, or an <a>array</a> containing a
+                combination of <code>@set</code> and any of
+                <code>@index</code>, <code>@id</code>, <code>@type</code>,
+                <code>@language</code> in any order
               </span>.
               Otherwise, an
               <a data-link-for="JsonLdErrorCode">invalid container mapping</a>
               has been detected and processing is aborted.</li>
             <li class="changed">If processingMode is <code>json-ld-1.0</code> and the container value
-              is <code>@id</code> or <code>@type</code>, or is otherwise not a <a>string</a>, an
+              is <code>@graph</code>, <code>@id</code>, or <code>@type</code>, or is otherwise not a <a>string</a>, an
               <a data-link-for="JsonLdErrorCode">invalid container mapping</a>
               has been detected and processing is aborted.</li>
             <li>Set the <a>container mapping</a> of <em>definition</em> to
@@ -1377,7 +1384,7 @@ <h3>Algorithm</h3>
                   algorithm recursively, passing <a>active context</a>,
                   <a>active property</a>, and <em>item</em> as <em>element</em>.</li>
                 <li>If the <a>active property</a> is <code>@list</code> or its
-                  <a>container mapping</a> is set to <code>@list</code>, the
+                  <a>container mapping</a> <span class="changed">includes</span> <code>@list</code>, the
                   <em>expanded item</em> must not be an <a>array</a> or a
                   <a>list object</a>, otherwise a
                   <a data-link-for="JsonLdErrorCode">list of lists</a>
@@ -1587,7 +1594,7 @@ <h3>Algorithm</h3>
               <em>key</em>'s <a>local context</a> as <a>local context</a>. Otherwise,
               set <em>term context</em> to <a>active context</a>.</li>
             <li>If <em>key</em>'s <a>container mapping</a> in
-              <em class="changed">term context</em> is <code>@language</code> and
+              <em class="changed">term context</em> <span class="changed">includes</span> <code>@language</code> and
               <em>value</em> is a <a class="changed">dictionary</a> then <em>value</em>
               is expanded from a <a>language map</a>
               as follows:
@@ -1612,7 +1619,9 @@ <h3>Algorithm</h3>
                           key-value pairs: (<code>@value</code>-<em>item</em>)
                           and (<code>@language</code>-lowercased
                           <em>language</em>),
-                          <span class="changed">unless <em>item</em> is <code>null</code></span>.</li>
+                          <span class="changed">unless <em>item</em> is <code>null</code></span>.
+                          <span class="ednote">From <a href="#issue-480">Issue 480</a>
+                          the <a>language tag</a> <code>@none</code> represents no language.</span></li>
                       </ol>
                     </li>
                   </ol>
@@ -1620,7 +1629,7 @@ <h3>Algorithm</h3>
               </ol>
             </li>
             <li>Otherwise, if <em>key</em>'s <a>container mapping</a> in
-              <em class="changed">term context</em> is <code>@index</code>,
+              <em class="changed">term context</em> <span class="changed">includes</span> <code>@index</code>,
               <span class="changed"><code>@type</code>, or <code>@id</code></span> and
               <em>value</em> is a <a class="changed">dictionary</a> then <em>value</em>
               is expanded from an map as follows:
@@ -1630,7 +1639,7 @@ <h3>Algorithm</h3>
                 <li>For each key-value pair <em>index</em>-<em>index value</em>
                   in <em>value</em>, ordered lexicographically by <em>index</em>:
                   <ol class="algorithm">
-                    <li class="changed">If <a>container mapping</a> is <code>@type</code>,
+                    <li class="changed">If <a>container mapping</a> <span class="changed">includes</span> <code>@type</code>,
                       and <em>index</em>'s <a>term definition</a> in
                       <em>term context</em> has a <a>local context</a>, set
                       <em>map context</em> to the result of the <a
@@ -1649,12 +1658,20 @@ <h3>Algorithm</h3>
                       and <em>index value</em> as <em>element</em>.</li>
                     <li>For each <em>item</em> in <em>index value</em>:
                       <ol class="algorithm changed">
-                        <li>If <a>container mapping</a> is <code>@index</code>
+                        <li>If <a>container mapping</a> <span class="changed">includes</span>
+                          <code>@graph</code> and if <em>item</em> is not a
+                          <a>graph object</a>, set <em>item</em> to a new
+                          <a>dictionary</a> containing the key-value pair
+                          <code>@graph</code>-<em>item</em>, ensuring that the
+                          value is represented using an <a>array</a>.</li>
+                        <li>If <a>container mapping</a> <span class="changed">includes</span> <code>@index</code>
                           and <em>item</em> does not have the key
                           <code>@index</code>, add the key-value pair
                           (<code>@index</code>-<em>index</em>) to
-                          <em>item</em>.</li>
-                        <li>Otherwise, if <a>container mapping</a> is <code>@id</code>
+                          <em>item</em>.
+                          <span class="ednote">From <a href="#issue-480">Issue 480</a>
+                          the index <code>@none</code> represents no index.</span></li>
+                        <li>Otherwise, if <a>container mapping</a> <span class="changed">includes</span> <code>@id</code>
                           and <em>item</em> does not have the key
                           <code>@id</code>, add the key-value pair
                           (<code>@id</code>-<em>expanded index</em>) to
@@ -1663,7 +1680,7 @@ <h3>Algorithm</h3>
                           <a href="#iri-expansion">IRI Expansion algorithm</a>,
                           passing <a>active context</a>, <em>index</em>, and <code>true</code>
                           for <em>document relative</em>.</li>
-                        <li>Otherwise, if <a>container mapping</a> is <code>@type</code>
+                        <li>Otherwise, if <a>container mapping</a> <span class="changed">includes</span> <code>@type</code>
                           set <em>types</em> to the concatenation of
                           <em>expanded index</em> with any existing values of
                           <code>@type</code> in <em>item</em>, where
@@ -1689,13 +1706,22 @@ <h3>Algorithm</h3>
             <li>If <em>expanded value</em> is <code>null</code>, ignore <em>key</em>
               by continuing to the next <em>key</em> from <em>element</em>.</li>
             <li>If the <a>container mapping</a> associated to <em>key</em> in
-              <em class="changed">term context</em> is <code>@list</code> and
+              <em class="changed">term context</em> <span class="changed">includes</span> <code>@list</code> and
               <em>expanded value</em> is not already a <a>list object</a>,
               convert <em>expanded value</em> to a <a>list object</a>
               by first setting it to an <a>array</a> containing only
               <em>expanded value</em> if it is not already an <a>array</a>,
               and then by setting it to a <a class="changed">dictionary</a> containing
               the key-value pair <code>@list</code>-<em>expanded value</em>.</li>
+            <li class="changed">If the <a>container mapping</a> associated to
+              <em>key</em> in <em>term context</em> <span>includes</span>
+              <code>@graph</code> and <em>expanded value</em> is not already a
+              <a>graph object</a>, convert <em>expanded value</em> to a
+              <a>graph object</a> by first setting it to an <a>array</a>
+              containing only <em>expanded value</em> if it is not already an
+              <a>array</a>, and then by setting it to a <a>dictionary</a>
+              containing the key-value pair <code>@graph</code>-<em>expanded
+              value</em>.</li>
             <li>Otherwise, if the <a>term definition</a> associated to
               <em>key</em> indicates that it is a <a>reverse property</a>
               <ol class="algorithm">
@@ -1872,7 +1898,9 @@ <h3>Algorithm</h3>
               value to the language code associated with the
               <a>language mapping</a>; unless the
               <a>language mapping</a> is set to <code>null</code> in
-              which case no member is added.</li>
+              which case no member is added. 
+              <span class="ednote">From <a href="#issue-480">Issue 480</a>
+              the <a>language tag</a> <code>@none</code> represents no language.</span></li>
             <li>Otherwise, if the <a>active context</a> has a
               <a>default language</a>, add an <code>@language</code>
               to <em>result</em> and set its value to the
@@ -2084,7 +2112,7 @@ <h3>Algorithm</h3>
                       <ol class="algorithm">
                         <li>If the <a>term definition</a> for <em>property</em> in
                           the <a>active context</a> has a
-                          <a>container mapping</a> of <code>@set</code> or
+                          <a>container mapping</a> <span class="changed">including</span> <code>@set</code> or
                           <a data-link-for="JsonLdOptions">compactArrays</a>
                           is <code>false</code>, and <em>value</em> is not an
                           <a>array</a>, set <em>value</em> to a new
@@ -2132,10 +2160,12 @@ <h3>Algorithm</h3>
             </li>
             <li>If <em>expanded property</em> is <code>@index</code> and
               <a>active property</a> has a <a>container mapping</a>
-              in <a>active context</a> that is <code>@index</code>,
+              in <a>active context</a> that <span class="changed">includes</span> <code>@index</code>,
               then the compacted result will be inside of an <code>@index</code>
               container, drop the <code>@index</code> property by continuing
-              to the next <em>expanded property</em>.</li>
+              to the next <em>expanded property</em>.
+              <span class="ednote">From <a href="#issue-480">Issue 480</a>
+              the index <code>@none</code> represents no index.</span></li>
             <li>Otherwise, if <em>expanded property</em> is <code>@index</code>,
               <code>@value</code>, or <code>@language</code>:
               <ol class="algorithm">
@@ -2217,8 +2247,9 @@ <h3>Algorithm</h3>
                   <a>active context</a>, <a>inverse context</a>,
                   <em>item active property</em> for <a>active property</a>,
                   <em>expanded item</em> for <em>element</em> if it does
-                  not contain the key <code>@list</code>, otherwise pass
-                  the key's associated value for <em>element</em>.</li>
+                  not contain the key <code>@list</code>
+                  <span class="changed">and is not a <a>graph object</a> containing <code>@list</code></span>,
+                  otherwise pass the key's associated value for <em>element</em>.</li>
                 <li>
                   If <em>expanded item</em> is a <a>list object</a>:
                   <ol class="algorithm">
@@ -2253,10 +2284,107 @@ <h3>Algorithm</h3>
                       error has been detected and processing is aborted.</li>
                   </ol>
                 </li>
+                <li class="changed">
+                  If <em>expanded item</em> is a <a>graph object</a>:
+                  <div class="ednote">This algorithm could be simplified by extracting
+                    common steps.</div>
+                  <ol class="algorithm">
+                    <li>If <em>container</em> includes <code>@graph</code> and <code>@id</code>:
+                      <ol class="algorithm">
+                        <li>Initialize <em>map object</em> to the value of <em>item active property</em>
+                          in <em class="changed">nest result</em>.</li>
+                        <li>Initialize <em>map key</em> to the result of calling the
+                          <a href="#iri-compaction">IRI Compaction algorithm</a>
+                          passing <a>active context</a> and the value associated
+                          with the key that equals <em>compacted container</em> in
+                          <em>compacted item</em> as <em>iri</em>.</li>
+                        <li class="changed">If <em>compacted item</em> is not an
+                          <a>array</a> and <em>as array</em> is <code>true</code>,
+                          set <em>compacted item</em> to an <a>array</a> containing that value.</li>
+                        <li>If <em>map key</em> is not a key in <em>map object</em>,
+                          then set this key's value in <em>map object</em>
+                          to <em>compacted item</em>. Otherwise, if the value
+                          is not an <a>array</a>, then set it to one
+                          containing only the value and then append
+                          <em>compacted item</em> to it.</li>
+                      </ol>
+                    </li>
+                    <li>Otherwise, if <em>container</em> includes <code>@graph</code> and <code>@index</code>
+                      and <em>expanded item</em> is a <a>simple graph object</a>:
+                      <ol class="algorithm">
+                        <li>Initialize <em>map object</em> to the value of <em>item active property</em>
+                          in <em class="changed">nest result</em>.</li>
+                        <li>Initialize <em>map key</em> the value of <code>@index</code> in
+                          <em>expanded item</em> or <code>@none</code>, if no such
+                          value exists.</li>
+                        <li class="changed">If <em>compacted item</em> is not an
+                          <a>array</a> and <em>as array</em> is <code>true</code>,
+                          set <em>compacted item</em> to an <a>array</a> containing that value.</li>
+                        <li>If <em>map key</em> is not a key in <em>map object</em>,
+                          then set this key's value in <em>map object</em>
+                          to <em>compacted item</em>. Otherwise, if the value
+                          is not an <a>array</a>, then set it to one
+                          containing only the value and then append
+                          <em>compacted item</em> to it.</li>
+                      </ol>
+                    </li>
+                    <li>Otherwise, if <em>container</em> includes <code>@graph</code>
+                      and <em>expanded item</em> is a <a>simple graph
+                      object</a> the value cannot be represented as a map
+                      object. If <em>compacted item</em> is not an <a>array</a>
+                      and <em>as array</em> is <code>true</code>, set
+                      <em>compacted item</em> to an <a>array</a> containing
+                      that value. If the value associated with the key that
+                      equals <em>item active property</em> in <em
+                      class="changed">nest result</em> is not an <a>array</a>,
+                      set it to a new <a>array</a> containing only the value.
+                      Then append <em>compacted item</em> to the value if
+                      <em>compacted item</em> is not an <a>array</a>,
+                      otherwise, concatenate it.
+                    </li>
+                    <li>Otherwise, <em>container</em> does not include <code>@graph</code>
+                      or otherwise does not match one of the previous cases, redo <em>compacted item</em>.
+                      <ol class="algorithm">
+                        <li>Set <em>compacted item</em> to a new dictionary containing
+                          the key resulting from calling the <a
+                          href="#iri-compaction">IRI Compaction algorithm</a>
+                          passing <a>active context</a>, <code>@graph</code> as
+                          <em>iri</em>, and <code>true</code> for
+                          <em>vocab</em> using the original <em>compacted
+                          item</em> as a value contained within an
+                          <a>array</a>.</li>
+                        <li>If expanded item contains the key <code>@id</code>,
+                          add the key resulting from calling the <a
+                          href="#iri-compaction">IRI Compaction algorithm</a>
+                          passing <a>active context</a>, <code>@id</code> as
+                          <em>iri</em>, and <code>true</code> for
+                          <em>vocab</em> using the value resulting from calling the <a
+                          href="#iri-compaction">IRI Compaction algorithm</a>
+                          passing <a>active context</a>, the value of <code>@id</code>
+                          in <em>expanded item</em> as
+                          <em>iri</em>.</li>
+                        <li>If expanded item contains the key <code>@index</code>,
+                          add the key resulting from calling the <a
+                          href="#iri-compaction">IRI Compaction algorithm</a>
+                          passing <a>active context</a>, <code>@index</code> as
+                          <em>iri</em>, and <code>true</code> for
+                          <em>vocab</em> using the value of <code>@index</code>
+                          in <em>expanded item</em>.</li>
+                        <li>If <em>as array</em> is <code>true</code>,
+                          set <em>compacted item</em> to an <a>array</a>
+                          containing that value.</li>
+                        <li>Then append <em>compacted item</em> to the value if
+                          <em>compacted item</em> is not an <a>array</a>,
+                          otherwise, concatenate it.</li>
+                      </ol>
+                    </li>
+                  </ol>
+                </li>
                 <li>
-                  If <em>container</em> <span class="changed">includes</span> <code>@language</code>,
+                  <span class="changed">Otherwise</span>, if <em>container</em> <span class="changed">includes</span> <code>@language</code>,
                   <code>@index</code>, <span class="changed"><code>@id</code>,
-                    or <code>@type</code></span>:
+                    or <code>@type</code></span>
+                    <span class="changed">and <em>container</em> does not include <code>@graph</code></span>:
                   <ol class="algorithm">
                     <li>If <em>item active property</em> is not a key in
                       <em class="changed">nest result</em>, initialize it to an empty <a class="changed">dictionary</a>.
@@ -2269,11 +2397,15 @@ <h3>Algorithm</h3>
                       for <em>vocab</em>.</li>
                     <li>Initialize <em>map key</em> to the value associated with
                       with the key that equals <em>container</em> in
-                      <em>expanded item</em>.</li>
+                      <em>expanded item</em>.
+                      <span class="ednote">From <a href="#issue-480">Issue 480</a>
+                      the index <code>@none</code> represents no index.</span></li>
                     <li>If <em>container</em> is <code>@language</code> and
                       <em>compacted item</em> contains the key
                       <code>@value</code>, then set <em>compacted item</em>
-                      to the value associated with its <code>@value</code> key.</li>
+                      to the value associated with its <code>@value</code> key.
+                      <span class="ednote">From <a href="#issue-480">Issue 480</a>
+                      the <a>language tag</a> <code>@none</code> represents no language.</span></li>
                     <li class="changed">If <em>container</em> is <code>@id</code>, set
                       <em>map key</em> to the result of calling the <a
                       href="#iri-compaction">IRI Compaction algorithm</a>
@@ -2651,6 +2783,8 @@ <h3>Algorithm</h3>
                   <em>common language</em>.</li>
               </ol>
             </li>
+            <li>Otherwise, if <em>value</em> is a <a>graph object</a>,
+              append <code>@graph</code> and <code>@set</code> to <em>containers</em>.</li>
             <li>Otherwise:
               <ol class="algorithm">
                 <li>If <em>value</em> is a <a>value object</a>:
@@ -2866,7 +3000,7 @@ <h3>Overview</h3>
         <a>active property</a> is set to <code>@id</code> or <code>@vocab</code>
         and <em>value</em> consists of only an <code>@id</code> member and, if
         the <a>container mapping</a> of <a>active property</a>
-        is set to <code>@index</code>, an <code>@index</code> member, <em>value</em>
+        <span class="changed">includes</span> <code>@index</code>, an <code>@index</code> member, <em>value</em>
         can be compacted to a <a>string</a> by returning the result of
         using the <a href="#iri-compaction">IRI Compaction algorithm</a>
         to compact the value associated with the <code>@id</code> member.
@@ -2877,10 +3011,10 @@ <h3>Overview</h3>
         This can be done if the <a>active property</a> has a matching
         <a>type mapping</a> or <a>language mapping</a> and there
         is either no <code>@index</code> member or the <a>container mapping</a>
-        of <a>active property</a> is set to <code>@index</code>. It can
+        of <a>active property</a> <span class="changed">includes</span> <code>@index</code>. It can
         also be done if <code>@value</code> is the only member in <em>value</em>
         (apart an <code>@index</code> member in case the <a>container mapping</a>
-        of <a>active property</a> is set to <code>@index</code>) and
+        of <a>active property</a> <span class="changed">includes</span> <code>@index</code>) and
         either its associated value is not a <a>string</a>, there is
         no <a>default language</a>, or there is an explicit
         <code>null</code> <a>language mapping</a> for the
@@ -2899,7 +3033,7 @@ <h3>Algorithm</h3>
           <em>value</em> contains.</li>
         <li>If <em>value</em> has an <code>@index</code> member and the
           <a>container mapping</a> associated to <a>active property</a>
-          is set to <code>@index</code>, decrease <em>number members</em> by
+          <span class="changed">includes</span> <code>@index</code>, decrease <em>number members</em> by
           <code>1</code>.</li>
         <li>If <em>number members</em> is greater than <code>2</code>, return
           <em>value</em> as it cannot be compacted.</li>
@@ -3530,7 +3664,7 @@ <h3>Algorithm</h3>
         <li>Initialize <em>literal</em> as an <a>RDF literal</a> using
           <em>value</em> and <em>datatype</em>. If <em>item</em> has an
           <code>@language</code> member, add the value associated with the
-          <code>@language</code> key as the language tag of <em>literal</em>.</li>
+          <code>@language</code> key as the <a>language tag</a> of <em>literal</em>.</li>
         <li>Return <em>literal</em>.</li>
       </ol>
     </section>
@@ -3922,7 +4056,7 @@ <h2>Data Round Tripping</h2>
       snippet of code to convert an integer to
       <a>canonical lexical form</a>:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample integer serialization implementation in JavaScript">
     <!--
     (value).toFixed(0).toString()
@@ -3951,7 +4085,7 @@ <h2>Data Round Tripping</h2>
       can use the following snippet of code to convert a double to
       <a>canonical lexical form</a>:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample floating point number serialization implementation in JavaScript">
     <!--
     (value).toExponential(15).replace(/(\d)0*e\+?/,'$1E')
@@ -4050,7 +4184,7 @@ <h3>The <dfn>JsonLdProcessor</dfn> Interface</h3>
       };
     </pre>
 
-    <dl>
+    <dl data-sort>
       <dt><dfn data-dfn-for="JsonLdProcessor">compact</dfn></dt><dd>
       <dd>
         <p><a>Compacts</a> the given <em>input</em> using the
@@ -4257,7 +4391,7 @@ <h3>The JsonLdOptions Type</h3>
       };
     --></pre>
 
-    <dl>
+    <dl data-sort>
       <dt><dfn data-dfn-for="JsonLdOptions">base</dfn></dt>
       <dd>The base IRI to use when expanding or <a>compacting</a> the document. If set, this overrides
         the input document's IRI.</dd>
@@ -4436,7 +4570,7 @@ <h4>JsonLdErrorCode</h4>
         };
       --></pre>
 
-      <dl data-dfn-for="JsonLdErrorCode">
+      <dl data-dfn-for="JsonLdErrorCode" data-sort>
         <dt><dfn>colliding keywords</dfn></dt>
         <dd>Two properties which expand to the same keyword have been detected.
           This might occur if a <a>keyword</a> and an alias thereof
@@ -4493,7 +4627,7 @@ <h4>JsonLdErrorCode</h4>
           value was detected.</dd>
         <dt><dfn>invalid language-tagged value</dfn></dt>
         <dd>A <a>number</a>, <code>true</code>, or <code>false</code> with an
-          associated language tag was detected.</dd>
+          associated <a>language tag</a> was detected.</dd>
         <dt><dfn>invalid local context</dfn></dt>
         <dd>In invalid <a>local context</a> was detected.</dd>
         <dt><dfn>invalid remote context</dfn></dt>
diff --git a/spec/latest/json-ld-framing/index.html b/spec/latest/json-ld-framing/index.html
index 3bd44994b..30c380ba8 100644
--- a/spec/latest/json-ld-framing/index.html
+++ b/spec/latest/json-ld-framing/index.html
@@ -122,7 +122,7 @@
   }
   ol.algorithm>li p, ol.algorithm>li div {text-indent: 0em}
   ol.algorithm>li>p:first-child {position: relative; display: inline;}
-  .highlight {
+  .hl-bold {
     font-weight: bold;
     color: #0a3;
   }
@@ -247,7 +247,7 @@ <h3>Framing</h3>
       framed output.</p>
 
     <p>For example, assume the following JSON-LD frame:</p>
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample library frame">
     <!--
     {
@@ -271,7 +271,7 @@ <h3>Framing</h3>
       as embedded values of the book object.</p>
 
     <p>When using a flattened set of objects that match the frame components:</p>
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Flattened library objects">
     <!--
     {
@@ -301,7 +301,7 @@ <h3>Framing</h3>
 
     <p>The Frame Algorithm can create a new document which follows the structure
       of the frame:</p>
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Framed library objects">
     <!--
     {
@@ -351,7 +351,7 @@ <h3>Default content</h3>
     <p class="note">The value of the property in the frame is not otherwise
       used in the output document. It's purpose is for frame matching and
       finding default values. Note the <em>description</em> value for <em>Library</em> in the following example.</p>
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample library frame with @default value">
     <!--
     {
@@ -370,7 +370,7 @@ <h3>Default content</h3>
     </pre>
 
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Sample library output with @default value">
     <!--
     {
@@ -419,7 +419,7 @@ <h4>Object Embed Flag</h4>
         Consider the following frame
         based on the default <code>@last</code> value of the <a>object embed flag</a>:</p>
 
-      <pre class="example" data-transform="updateExample"
+      <pre class="example nohighlight" data-transform="updateExample"
            title="Sample library frame with implicit @embed set to @last">
       <!--
       {
@@ -438,7 +438,7 @@ <h4>Object Embed Flag</h4>
        <p>However, if the <code>@embed</code> property is added explicitly with a
          value of <code>@never</code>, the values for <em>Book</em> and <em>Chapter</em> will be excluded.</p>
 
-      <pre class="example" data-transform="updateExample"
+      <pre class="example nohighlight" data-transform="updateExample"
            title="Sample library frame with explicit @embed set to @never">
       <!--
       {
@@ -452,7 +452,7 @@ <h4>Object Embed Flag</h4>
       -->
       </pre>
 
-      <pre class="example" data-transform="updateExample"
+      <pre class="example nohighlight" data-transform="updateExample"
            title="Framed library objects with @embed set to @never">
       <!--
       {
@@ -484,7 +484,7 @@ <h4>Explicit inclusion flag</h4>
       <p>For example, take an expanded version of the library frame which include
         some properties from the input, but omit others.</p>
 
-      <pre class="example" data-transform="updateExample"
+      <pre class="example nohighlight" data-transform="updateExample"
            title="Sample library frame with @explicit set to true">
       <!--
       {
@@ -561,7 +561,7 @@ <h3>Reverse Framing</h3>
       to invert the relationships in the output object. For example, the
       Library example can be inverted using the following frame:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Inverted library frame">
     <!--
     {
@@ -582,7 +582,7 @@ <h3>Reverse Framing</h3>
 
     <p>Using the flattened library example above, results in the following:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Inverted library output">
     <!--
     {
@@ -625,7 +625,7 @@ <h3>Framing Named Graphs</h3>
     <p>The following example uses a variation on our library theme where information
       is split between the <a>default graph</a>, and a graph named <code>http://example.org/graphs/books</code>:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Frame with named graphs">
     <!--
     {
@@ -641,7 +641,7 @@ <h3>Framing Named Graphs</h3>
     -->
     </pre>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Flattened Input with named graphs">
     <!--
     [{
@@ -671,7 +671,7 @@ <h3>Framing Named Graphs</h3>
     -->
     </pre>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Framed output with named graphs">
     <!--
     {
@@ -746,7 +746,7 @@ <h2>Syntax Tokens and Keywords</h2>
   <p>This specification adds a number of <a>keywords</a> (<dfn>framing keywords</dfn>) to
     the ones defined in the [[!JSON-LD]] specification:</p>
 
-  <dl>
+  <dl data-sort>
     <dt><code>@default</code></dt>
     <dd>Used in <a href="#framing">Framing</a> to set the default value for
       an output property when the framed <a>node object</a> does not include such a property.</dd>
@@ -754,7 +754,7 @@ <h2>Syntax Tokens and Keywords</h2>
     <dd>Used in <a href="#framing">Framing</a> to override the
       value of <a>object embed flag</a> within a specific frame. Valid values for
       <code>@embed</code> as the following:
-      <dl>
+      <dl data-sort>
         <dt><code>@always</code></dt><dd>
           Always embed <a>node objects</a> as property values, unless this would
           cause a circular reference.
@@ -1076,7 +1076,7 @@ <h2>Frame Matching Algorithm</h2>
   <p class="note">As matching is performed on expanded node objects, all values will be in the form of an array.</p>
 
   <p>Node matching uses a combination of JSON constructs to match <em>any</em>, <em>zero</em>, or <em>some</em> specific values:</p>
-  <dl>
+  <dl data-sort>
     <dt><code>[]</code> (<code><dfn>match none</dfn></code>)</dt>
     <dd>An empty array matches no values, or a value which is, itself, an empty array.</dd>
     <dt><code>{}</code> (<code><dfn>wildcard</dfn></code>)</dt>
@@ -1283,7 +1283,7 @@ <h3>Error Handling</h3>
 
     <p>The <dfn>JsonLdFramingErrorCode</dfn> represents the collection of valid JSON-LD Framing error
       codes.</p>
-    <dl data-dfn-for="JsonLdFramingErrorCode">
+    <dl data-dfn-for="JsonLdFramingErrorCode" data-sort>
       <dt><dfn>invalid frame</dfn></dt><dd>
         The frame is invalid.
       </dd>
@@ -1334,7 +1334,7 @@ <h3>JsonLdOptions</h3>
     <p>In addition to those options defined in [[JSON-LD API]], framing defines these
       additional options:</p>
 
-    <dl>
+    <dl data-sort>
       <dt><dfn data-dfn-for="JsonLdOptions">embed</dfn></dt>
       <dd>Sets the value <a>object embed flag</a> used in the
         <a href="#framing-algorithm">Framing Algorithm</a>.
@@ -1359,7 +1359,7 @@ <h3>JsonLdOptions</h3>
     </dl>
 
     <p><dfn>JsonLdEmbed</dfn> enumerates the values of the <a data-link-for="JsonLdOptions">embed</a> option:</p>
-    <dl>
+    <dl data-sort>
       <dt><dfn data-dfn-for="JsonLdEmbed">@always</dfn></dt><dd>
         Always embed <a>node objects</a> as property values, unless this would
         cause a circular reference.</dd>
diff --git a/spec/latest/json-ld/index.html b/spec/latest/json-ld/index.html
index 9adc96cff..e9058ac21 100644
--- a/spec/latest/json-ld/index.html
+++ b/spec/latest/json-ld/index.html
@@ -88,10 +88,10 @@
 //]]>
 </script>
 <style type="text/css">
-  .highlight { font-weight: bold; color: #0a3; }
+  .hl-bold { font-weight: bold; color: #0a3; }
   .comment { color: #999; }
   table, thead, tr, td { padding: 5px; border-width: 1px; border-spacing: 0px; border-style: solid; border-collapse: collapse; }
-  .highlight {
+  .hl-bold {
     font-weight: bold;
     color: #0a3;
   }
@@ -347,7 +347,7 @@ <h2>Syntax Tokens and Keywords</h2>
     <p>JSON-LD specifies a number of syntax tokens and <a>keywords</a>
     that are a core part of the language:</p>
 
-    <dl>
+    <dl data-sort>
       <dt><code>@context</code></dt>
       <dd>Used to define the short-hand names that are used throughout a JSON-LD
         document. These short-hand names are called <a>terms</a> and help
@@ -374,12 +374,17 @@ <h2>Syntax Tokens and Keywords</h2>
         <a class="sectionRef" href="#typed-values"></a>.</dd>
       <dt><code>@container</code></dt>
       <dd>Used to set the default container type for a <a>term</a>.
-        This keyword is described in <a class="sectionRef" href="#sets-and-lists"></a>,
-        <span class="changed"><a class="sectionRef" href="#data-indexing"></a>,
-          <a class="sectionRef" href="#language-indexing"></a>,
-          <a class="sectionRef" href="#node-identifier-indexing"></a>, and
-          <a class="sectionRef" href="#node-type-indexing"></a>
-        </span>.</dd>
+        This keyword is described in the following sections:
+        <ul>
+        <li><a class="sectionRef" href="#sets-and-lists"></a>,</li>
+        <li class="changed"><a class="sectionRef" href="#named-graphs"></a>,</li>
+        <li><a class="sectionRef" href="#data-indexing"></a>,</li>
+        <li class="changed"><a class="sectionRef" href="#named-graph-indexing"></a>,</li>
+        <li class="changed"><a class="sectionRef" href="#language-indexing"></a>,</li>
+        <li class="changed"><a class="sectionRef" href="#node-identifier-indexing"></a>,</li>
+        <li class="changed"><a class="sectionRef" href="#named-graph-indexing-by-identifier"></a>, and</li>
+        <li class="changed"><a class="sectionRef" href="#node-type-indexing"></a>.</li>
+        </ul>.</dd>
       <dt><code>@list</code></dt>
       <dd>Used to express an ordered set of data.
         This keyword is described in <a class="sectionRef" href="#sets-and-lists"></a>.</dd>
@@ -433,6 +438,24 @@ <h2>Syntax Tokens and Keywords</h2>
     can be interpreted as JSON-LD by following the normative statements in
     <a class="sectionRef" href="#interpreting-json-as-json-ld"></a>. For convenience, normative
     statements for documents are often phrased as statements on the properties of the document.</p>
+
+  <p>This specification makes use of the following namespaces:</p>
+  <dl>
+    <dt><code>dc</code>:</dt>
+    <dd><code>http://purl.org/dc/terms/</code></dd>
+    <dt><code>cred</code>:</dt>
+    <dd><code>https://w3id.org/credentials#</code></dd>
+    <dt><code>foaf</code>:</dt>
+    <dd><code>http://xmlns.com/foaf/0.1/</code></dd>
+    <dt><code>prov</code></dt>
+    <dd><code>http://www.w3.org/ns/prov#</code></dd>
+    <dt><code>rdf</code>:</dt>
+    <dd><code>http://www.w3.org/1999/02/22-rdf-syntax-ns#</code></dd>
+    <dt><code>schema</code>:</dt>
+    <dd><code>http://schema.org/</code></dd>
+    <dt><code>xsd</code>:</dt>
+    <dd><code>http://www.w3.org/2001/XMLSchema#</code></dd>
+  </dl>
 </section>
 
 <section class="informative">
@@ -479,7 +502,7 @@ <h1>Basic Concepts</h1>
   <p>Leveraging the popular <a href="http://schema.org/">schema.org vocabulary</a>,
     the example above could be unambiguously expressed as follows:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Sample JSON-LD document using full IRIs instead of terms">
   <!--
   {
@@ -517,7 +540,7 @@ <h2>The Context</h2>
     <p>For the sample document in the previous section, a <a>context</a> would
       look something like this:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Context for the sample document in the previous section">
     <!--
     {
@@ -560,7 +583,7 @@ <h2>The Context</h2>
       it can be referenced by adding a single line and allows a JSON-LD document to
       be expressed much more concisely as shown in the example below:</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="Referencing a JSON-LD context">
     <!--
     {
@@ -596,7 +619,7 @@ <h2>The Context</h2>
       absence of a connection to the Web. Ultimately, this is a modeling decision
       and different use cases may require different handling.</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="In-line context definition">
     <!--
     {
@@ -642,7 +665,7 @@ <h2>IRIs</h2>
   <p>A <a>string</a> is interpreted as an <a>IRI</a> when it is the
     value of an <code>@id</code> member:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Values of @id are interpreted as IRI">
   <!--
   {
@@ -661,7 +684,7 @@ <h2>IRIs</h2>
     information on where  <a>relative IRIs</a> can be
     used, please refer to section <a href="#json-ld-grammar"></a>).</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="IRIs can be relative">
   <!--
   {
@@ -675,7 +698,7 @@ <h2>IRIs</h2>
   <p><a>Absolute IRIs</a> can be expressed directly
     in the key position like so:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="IRI as a key">
   <!--
   {
@@ -692,7 +715,7 @@ <h2>IRIs</h2>
   <p>Term-to-IRI expansion occurs if the key matches a <a>term</a> defined
     within the <a>active context</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Term expansion from context definition">
   <!--
   {
@@ -711,7 +734,7 @@ <h2>IRIs</h2>
   <p>If type <a>coercion</a> rules are specified in the <code>@context</code> for
     a particular <a>term</a> or property IRI, an IRI is generated:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Type coercion">
   <!--
   {****
@@ -772,7 +795,7 @@ <h2>Node Identifiers</h2>
   <p>In JSON-LD, a <a>node</a> is identified using the <code>@id</code>
     <a>keyword</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Identifying a node">
   <!--
   {
@@ -804,7 +827,7 @@ <h2>Specifying the Type</h2>
   <a>keyword</a>. In Linked Data, types are uniquely
   identified with an <a>IRI</a>.</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Specifying the type for a node">
 <!--
 {
@@ -818,7 +841,7 @@ <h2>Specifying the Type</h2>
 
 <p>A node can be assigned more than one type by using an <a>array</a>:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Specifying multiple types for a node">
 <!--
 {
@@ -831,7 +854,7 @@ <h2>Specifying the Type</h2>
 </pre>
 
 <p>The value of an <code>@type</code> key may also be a <a>term</a> defined in the <a>active context</a>:</p>
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Using a term to specify the type">
 <!--
 {
@@ -876,7 +899,7 @@ <h2>JSON-LD 1.1 Processing Mode</h2>
     This may be set using the <code>@version</code> member in a <code>context</code>
     set to the value <code>1.1</code> as a <a>number</a>, or through an API option.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Setting @version in context">
   <!--
   {
@@ -911,7 +934,7 @@ <h2>Base IRI</h2>
   <p>For example, if a JSON-LD document was retrieved from <code>http://example.com/document.jsonld</code>,
     relative IRIs would resolve against that IRI:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Use a relative IRI as node identifier">
     <!--
     {
@@ -929,7 +952,7 @@ <h2>Base IRI</h2>
     To prevent this without having to use an <a>absolute IRI</a>, a <a>context</a>
     may define an <code>@base</code> mapping, to overwrite the <a>base IRI</a> for the document.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Setting the document base in a document">
   <!--
   {
@@ -961,7 +984,7 @@ <h2>Default Vocabulary</h2>
     a <a>compact IRI</a> nor an <a>absolute IRI</a> (i.e., they do
     not contain a colon).</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Using a common vocabulary prefix">
   <!--
     {
@@ -983,7 +1006,7 @@ <h2>Default Vocabulary</h2>
     example below the <code>databaseId</code> member would not expand to an
     <a>IRI</a>.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Using the null keyword to ignore data">
   <!--
     {
@@ -1016,7 +1039,7 @@ <h2>Compact IRIs</h2>
     <code>foaf:name</code> would be expanded to the IRI
     <code>http://xmlns.com/foaf/0.1/name</code>.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Prefix expansion">
   <!--
   {
@@ -1065,11 +1088,12 @@ <h2>Compact IRIs</h2>
   <p>It's also possible to use compact IRIs within the context as shown in the
     following example:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
      title="Using vocabularies">
   <!--
   {
     "@context": {
+      ****"@version": 1.1****,
       "xsd": "http://www.w3.org/2001/XMLSchema#",
       ****"foaf": "http://xmlns.com/foaf/0.1/"****,
       ****"foaf:homepage"****: { "@type": "@id" },
@@ -1105,7 +1129,7 @@ <h2>Typed Values</h2>
 <p>The first example uses the <code>@type</code> keyword to associate a
 type with a particular <a>term</a> in the <code>@context</code>:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Expanded term definition with type coercion">
 <!--
 {
@@ -1140,7 +1164,7 @@ <h2>Typed Values</h2>
   <td>http://example.com/docs/1</td>
   <td>http://purl.org/dc/terms/modified</td>
   <td>2010-05-29T14:17:39+02:00</td>
-  <td>http://www.w3.org/2001/XMLSchema#dateTime</td>
+  <td>xsd:dateTime</td>
 </tr>
 </tbody>
 </table>
@@ -1148,7 +1172,7 @@ <h2>Typed Values</h2>
 <p>The second example uses the expanded form of setting the type information
 in the body of a JSON-LD document:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Expanded value with type">
 <!--
 {
@@ -1182,7 +1206,7 @@ <h2>Typed Values</h2>
   <dfn>value type</dfn> specifies the data type of a particular value, such
   as an integer, a floating point number, or a date.</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Example demonstrating the context-sensitivity for @type">
 <!--
 {
@@ -1220,15 +1244,15 @@ <h2>Typed Values</h2>
 <tbody>
 <tr>
   <td>http://example.org/posts#TripToWestVirginia</td>
-  <td>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</td>
-  <td>http://schema.org/BlogPosting</td>
+  <td>rdf:type</td>
+  <td>schema:BlogPosting</td>
   <td style="text-align:center;">-</td>
 </tr>
 <tr>
   <td>http://example.org/posts#TripToWestVirginia</td>
-  <td>http://purl.org/dc/terms/modified</td>
+  <td>dc:modified</td>
   <td>2010-05-29T14:17:39+02:00</td>
-  <td>http://www.w3.org/2001/XMLSchema#dateTime</td>
+  <td>xsd:dateTime</td>
 </tr>
 </tbody>
 </table>
@@ -1267,7 +1291,7 @@ <h2>Type Coercion</h2>
 <p>The example below demonstrates how a JSON-LD author can coerce values to
 <a>typed values</a> and <a>IRIs</a>.</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Expanded term definition with types">
 <!--
 {
@@ -1306,19 +1330,19 @@ <h2>Type Coercion</h2>
 <tbody>
 <tr>
   <td>http://example.com/people#john</td>
-  <td>http://xmlns.com/foaf/0.1/name</td>
+  <td>foaf:name</td>
   <td>John Smith</td>
   <td>&nbsp;</td>
 </tr>
 <tr>
   <td>http://example.com/people#john</td>
-  <td>http://xmlns.com/foaf/0.1/age</td>
+  <td>foaf:age</td>
   <td>41</td>
-  <td>http://www.w3.org/2001/XMLSchema#integer</td>
+  <td>xsd:integer</td>
 </tr>
 <tr>
   <td rowspan="2">http://example.com/people#john</td>
-  <td rowspan="2">http://xmlns.com/foaf/0.1/homepage</td>
+  <td rowspan="2">foaf:homepage</td>
   <td>http://personal.example.org/</td>
   <td><a>IRI</a></td>
 </tr>
@@ -1334,7 +1358,7 @@ <h2>Type Coercion</h2>
   to be applied to keys which are not represented as a simple <a>term</a>.
   For example:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Term definitions using compact and absolute IRIs">
 <!--
 {
@@ -1390,7 +1414,7 @@ <h2>Embedding</h2>
 
   <p>The example shows two nodes related by a property from the first node:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Embedding a node object as property value of another node object">
   <!--
   {
@@ -1424,7 +1448,7 @@ <h2>Advanced Context Usage</h2>
     <a>JSON-LD document</a> may use more than one context at different
     points in a document:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Using multiple contexts">
   <!--
   [
@@ -1450,7 +1474,7 @@ <h2>Advanced Context Usage</h2>
   <p>Duplicate context <a>terms</a> are overridden using a
     most-recently-defined-wins mechanism.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Scoped contexts within node objects">
   <!--
   {
@@ -1490,7 +1514,7 @@ <h2>Advanced Context Usage</h2>
     to an empty context. The following example specifies an external context
     and then layers an embedded context on top of the external context:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Combining external and local contexts">
   <!--
   {
@@ -1551,7 +1575,7 @@ <h2>Interpreting JSON as JSON-LD</h2>
   <p>The following example demonstrates the use of an external context with an
     ordinary JSON document:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Referencing a JSON-LD context from a JSON document via an HTTP Link Header">
   <!--
   GET /ordinary-json-document.json HTTP/1.1
@@ -1589,7 +1613,7 @@ <h2>String Internationalization</h2>
     First, it is possible to define a <a>default language</a> for a JSON-LD document
     by setting the <code>@language</code> key in the <a>context</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Setting the default language of a JSON-LD document">
   <!--
   {
@@ -1611,7 +1635,7 @@ <h2>String Internationalization</h2>
   <p>To clear the <a>default language</a> for a subtree, <code>@language</code> can
     be set to <code>null</code> in a <a>local context</a> as follows:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Clearing default language">
   <!--
   {
@@ -1621,7 +1645,7 @@ <h2>String Internationalization</h2>
     },
     "name": "花澄",
     "details": {
-  ****    "@context": {
+      ****"@context": {
         "@language": null
       }****,
       "occupation": "Ninja"
@@ -1633,7 +1657,7 @@ <h2>String Internationalization</h2>
   <p>Second, it is possible to associate a language with a specific <a>term</a>
     using an <a>expanded term definition</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Expanded term definition with language">
   <!--
   {
@@ -1673,7 +1697,7 @@ <h2>String Internationalization</h2>
     the language-specific data. In this case, <a>language maps</a>
     may be utilized.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Language map expressing a property in three languages">
   <!--
   {
@@ -1703,7 +1727,7 @@ <h2>String Internationalization</h2>
   <p>Third, it is possible to override the <a>default language</a> by using a
     <a>value object</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Overriding default language using an expanded value">
   <!--
   {
@@ -1724,7 +1748,7 @@ <h2>String Internationalization</h2>
     <code>@language</code> tag or setting it to <code>null</code> when expressing
     it using a <a>value object</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Removing language information using an expanded value">
   <!--
   {
@@ -1755,7 +1779,7 @@ <h2>IRI Expansion within a Context</h2>
     there are no circular dependencies. For example, it is common to use
     the <code>xsd</code> namespace when defining <a>typed values</a>:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="IRI expansion within a context">
 <!--
 {
@@ -1783,7 +1807,7 @@ <h2>IRI Expansion within a Context</h2>
 <p><a>Terms</a> may also be used when defining the IRI of another
 <a>term</a>:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Using a term to define the IRI of another term within a context">
 <!--
 {
@@ -1809,7 +1833,7 @@ <h2>IRI Expansion within a Context</h2>
   and <a>IRIs</a> may be used on the left-hand side of a
   <a>term</a> definition.</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Using a compact IRI as a term">
 <!--
 {
@@ -1846,7 +1870,7 @@ <h2>IRI Expansion within a Context</h2>
 <a>Absolute IRIs</a> may also be used in the key position in a <a>context</a>:
 </p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Associating context definitions with absolute IRIs">
 <!--
 {
@@ -1886,7 +1910,7 @@ <h2>IRI Expansion within a Context</h2>
   definition of <em>term2</em> if <em>term2</em> also depends on
   <em>term1</em>. For example, the following <a>context</a> definition
   is illegal:</p>
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Illegal circular definition of terms within a context">
 <!--
 {
@@ -1910,7 +1934,7 @@ <h2>Sets and Lists</h2>
   arrays, which are ordered by default. For example, consider the following
   simple document:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Multiple values with no inherent order">
 <!--
 {
@@ -1934,17 +1958,17 @@ <h2>Sets and Lists</h2>
 <tbody>
 <tr>
   <td>http://example.org/people#joebob</td>
-  <td>http://xmlns.com/foaf/0.1/nick</td>
+  <td>foaf:nick</td>
   <td>joe</td>
 </tr>
 <tr>
   <td>http://example.org/people#joebob</td>
-  <td>http://xmlns.com/foaf/0.1/nick</td>
+  <td>foaf:nick</td>
   <td>bob</td>
 </tr>
 <tr>
   <td>http://example.org/people#joebob</td>
-  <td>http://xmlns.com/foaf/0.1/nick</td>
+  <td>foaf:nick</td>
   <td>JB</td>
 </tr>
 </tbody>
@@ -1952,7 +1976,7 @@ <h2>Sets and Lists</h2>
 
 <p>Multiple values may also be expressed using the expanded form:</p>
 
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Using an expanded form to set multiple values">
 <!--
 {
@@ -1983,13 +2007,13 @@ <h2>Sets and Lists</h2>
 <tbody>
 <tr>
   <td>http://example.org/articles/8</td>
-  <td>http://purl.org/dc/terms/title</td>
+  <td>dc:title</td>
   <td>Das Kapital</td>
   <td>de</td>
 </tr>
 <tr>
   <td>http://example.org/articles/8</td>
-  <td>http://purl.org/dc/terms/title</td>
+  <td>dc:title</td>
   <td>Capital</td>
   <td>en</td>
 </tr>
@@ -1999,7 +2023,7 @@ <h2>Sets and Lists</h2>
 <p>As the notion of ordered collections is rather important in data
   modeling, it is useful to have specific language support. In JSON-LD,
   a list may be represented using the <code>@list</code> <a>keyword</a> as follows:</p>
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="An ordered collection of values in JSON-LD">
 <!--
 {
@@ -2017,7 +2041,7 @@ <h2>Sets and Lists</h2>
   and order is maintained when processing a document. If every use of a given multi-valued
   property is a list, this may be abbreviated by setting <code>@container</code>
   to <code>@list</code> in the <a>context</a>:</p>
-<pre class="example" data-transform="updateExample"
+<pre class="example nohighlight" data-transform="updateExample"
      title="Specifying that a collection is ordered in the context">
 <!--
 {
@@ -2069,7 +2093,7 @@ <h2>Reverse Properties</h2>
     be expressed with a <a>property</a> pointing to the parent as in the following
     example.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="A document with children linking to their parent">
   <!--
   [
@@ -2092,7 +2116,7 @@ <h2>Reverse Properties</h2>
   <p>Expressing such data is much simpler by using JSON-LD's <code>@reverse</code>
     <a>keyword</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="A person and its children using a reverse property">
   <!--
   {
@@ -2118,7 +2142,7 @@ <h2>Reverse Properties</h2>
     to create reverse properties as shown in the following example:</p>
 
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Using @reverse to define reverse properties">
   <!--
   {
@@ -2152,11 +2176,12 @@ <h2>Scoped Contexts</h2>
     <a>node object</a> they are contained in, in exactly the same was as if the
     <a>context</a> were specified within the value itself.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Defining an @context within a term definition">
   <!--
   {
     "@context": {
+      ****"@version": 1.1****,
       "name": "http://schema.org/name",
       "interest": {
         "@id": "http://xmlns.com/foaf/0.1/interest",
@@ -2177,7 +2202,7 @@ <h2>Scoped Contexts</h2>
 
   <p>Expanding this document, uses a combination of terms defined in the outer context, and those defined specifically for that term.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Expanded document using a scoped context">
   <!--
   [{
@@ -2195,11 +2220,13 @@ <h2>Scoped Contexts</h2>
     <a>expanded term definitions</a>
     to create reverse properties as shown in the following example:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Using @reverse to define reverse properties">
   <!--
   {
-    "@context": { "name": "http://example.com/vocab#name",
+    "@context": {
+      ****"@version": 1.1****,
+      "name": "http://example.com/vocab#name",
       ****"children": { "@reverse": "http://example.com/vocab#parent" }****
     },
     "@id": "#homer",
@@ -2219,11 +2246,12 @@ <h2>Scoped Contexts</h2>
 
   <p>Scoping can also be performed using a term used as a value of <code>@type</code>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Defining an @context within a term definition used on @type">
   <!--
   {
     "@context": {
+      ****"@version": 1.1****,
       "name": "http://schema.org/name",
       "interest": "http://xmlns.com/foaf/0.1/interest",
       ****"Document"****: {
@@ -2260,7 +2288,7 @@ <h2>Named Graphs</h2>
     <code>@graph</code> <a>keyword</a> by pairing it with an
     <code>@id</code> <a>keyword</a> as shown in the following example:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Identifying and making statements about a graph">
   <!--
   {
@@ -2273,7 +2301,7 @@ <h2>Named Graphs</h2>
       "name": "http://xmlns.com/foaf/0.1/name",
       "knows": "http://xmlns.com/foaf/0.1/knows"
     },
-    ****"@id": "http://example.org/graphs/73",
+    ****"@id": "_:graph",
     "generatedAt": "2012-04-09",
     "@graph":**** [
       {
@@ -2293,7 +2321,7 @@ <h2>Named Graphs</h2>
   </pre>
 
   <p>The example above expresses a <a>named graph</a> that is identified
-    by the <a>IRI</a> <code>http://example.org/graphs/73</code>. That
+    by the <a>Blank Node identifier</a> <code>_:graph</code>. That
     graph is composed of the statements about Manu and Gregg. Metadata about
     the graph itself is expressed via the <code>generatedAt</code> property,
     which specifies when the graph was generated. An alternative view of the
@@ -2310,50 +2338,50 @@ <h2>Named Graphs</h2>
   <tbody>
   <tr>
     <td>&nbsp;</td>
-    <td>http://example.org/graphs/73</td>
-    <td>http://www.w3.org/ns/prov#generatedAtTime</td>
+    <td>_:graph</td>
+    <td>prov:generatedAtTime</td>
     <td>2012-04-09</td>
-    <td>http://www.w3.org/2001/XMLSchema#date</td>
+    <td>xsd:date</td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://manu.sporny.org/about#manu</td>
-    <td>http://www.w3.org/2001/XMLSchema#type</td>
-    <td>http://xmlns.com/foaf/0.1/Person</td>
+    <td>xsd:type</td>
+    <td>foaf:Person</td>
     <td></td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://manu.sporny.org/about#manu</td>
-    <td>http://xmlns.com/foaf/0.1/name</td>
+    <td>foaf:name</td>
     <td>Manu Sporny</td>
     <td></td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://manu.sporny.org/about#manu</td>
-    <td>http://xmlns.com/foaf/0.1/knows</td>
+    <td>foaf:knows</td>
     <td>http://greggkellogg.net/foaf#me</td>
     <td></td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://greggkellogg.net/foaf#me</td>
-    <td>http://www.w3.org/2001/XMLSchema#type</td>
-    <td>http://xmlns.com/foaf/0.1/Person</td>
+    <td>xsd:type</td>
+    <td>foaf:Person</td>
     <td></td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://greggkellogg.net/foaf#me</td>
-    <td>http://xmlns.com/foaf/0.1/name</td>
+    <td>foaf:name</td>
     <td>Gregg Kellogg</td>
     <td></td>
   </tr>
   <tr>
-    <td>http://example.org/graphs/73</td>
+    <td>_:graph</td>
     <td>http://greggkellogg.net/foaf#me</td>
-    <td>http://xmlns.com/foaf/0.1/knows</td>
+    <td>foaf:knows</td>
     <td>http://manu.sporny.org/about#manu</td>
     <td></td>
   </tr>
@@ -2373,7 +2401,7 @@ <h2>Named Graphs</h2>
     <code>@graph</code> keyword collects such nodes in an <a>array</a>
     and allows the use of a shared context.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
     title="Using @graph to explicitly express the default graph">
   <!--
   {
@@ -2400,7 +2428,7 @@ <h2>Named Graphs</h2>
     <a>node objects</a> in array and defining
     the <code>@context</code> within each <a>node object</a>:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
     title="Context needs to be duplicated if @graph is not used">
   <!--
   [
@@ -2422,6 +2450,179 @@ <h2>Named Graphs</h2>
   -->
   </pre>
 
+  <section class="changed">
+    <h3>Graph Containers</h3>
+    <p>In some cases, it is useful to logically partition data into separate
+      graphs, without making this explicit within the JSON expression. For
+      example, a JSON document may contain data against which other metadata is
+      asserted and it is useful to separate this data in the data model using
+      the notion of <a>named graphs</a>, without the syntactic overhead
+      associated with the <code>@graph</code> keyword.</p>
+
+    <p>An <a>expanded term definition</a> can use <code>@graph</code> as the
+      value of <code>@container</code>. This indicates that values of this
+      <a>term</a> shoud be considered to be <a>named graphs</a>, where the
+      <a>graph name</a> is an automatically assigned <a>blank node identifier</a>
+      creating an <a>implicitly named graph</a>. When expanded, these become
+      <a>simple graph objects</a>.</p>
+
+ <p>An alternative to our example above could use an anoymously named graph
+    as follows:</p>
+
+    <pre class="example nohighlight" data-transform="updateExample"
+         title="Implicitly named graph">
+    <!--
+    {
+      "@context": {
+        "@version": 1.1,
+        "generatedAt": {
+          "@id": "http://www.w3.org/ns/prov#generatedAtTime",
+          "@type": "http://www.w3.org/2001/XMLSchema#date"
+        },
+        "Person": "http://xmlns.com/foaf/0.1/Person",
+        "name": "http://xmlns.com/foaf/0.1/name",
+        "knows": "http://xmlns.com/foaf/0.1/knows",
+        ****"claim": {
+         "@id": "https://w3id.org/credentials#claim",
+          "@container": "@graph"
+        }****
+      },
+      ****"generatedAt": "2012-04-09",
+      "claim": [****
+        {
+          "@id": "http://manu.sporny.org/about#manu",
+          "@type": "Person",
+          "name": "Manu Sporny",
+          "knows": "http://greggkellogg.net/foaf#me"
+        }, {
+          "@id": "http://greggkellogg.net/foaf#me",
+          "@type": "Person",
+          "name": "Gregg Kellogg",
+          "knows": "http://manu.sporny.org/about#manu"
+        }
+      ****]****
+    }
+    -->
+    </pre>
+
+    <p>The example above expresses a <a>named graph</a> that is identified
+      by the <a>blank node identifier</a> <code>_:claim</code>. That
+      graph is composed of the statements about Manu and Gregg. Metadata about
+      the graph itself is expressed via the <code>generatedAt</code> property,
+      which specifies when the graph was generated. An alternative view of the
+      information above is represented in table form below:</p>
+
+    <table class="example">
+    <thead><tr>
+      <th>Graph</th>
+      <th>Subject</th>
+      <th>Property</th>
+      <th>Value</th>
+      <th>Value Type</th>
+    </tr></thead>
+    <tbody>
+    <tr>
+      <td>&nbsp;</td>
+      <td>_:metadata</td>
+      <td>prov:generatedAtTime</td>
+      <td>2012-04-09</td>
+      <td>xsd:date</td>
+    </tr>
+    <tr>
+      <td>&nbsp;</td>
+      <td>_:metadata</td>
+      <td>cred:claim</td>
+      <td>_:claim</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://manu.sporny.org/about#manu</td>
+      <td>xsd:type</td>
+      <td>foaf:Person</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://manu.sporny.org/about#manu</td>
+      <td>foaf:name</td>
+      <td>Manu Sporny</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://manu.sporny.org/about#manu</td>
+      <td>foaf:knows</td>
+      <td>http://greggkellogg.net/foaf#me</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://greggkellogg.net/foaf#me</td>
+      <td>xsd:type</td>
+      <td>foaf:Person</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://greggkellogg.net/foaf#me</td>
+      <td>foaf:name</td>
+      <td>Gregg Kellogg</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>_:claim</td>
+      <td>http://greggkellogg.net/foaf#me</td>
+      <td>foaf:knows</td>
+      <td>http://manu.sporny.org/about#manu</td>
+      <td></td>
+    </tr>
+    </tbody>
+    </table>
+
+    <p>Expanding this graph results in the following:</p>
+
+    <pre class="example nohighlight" data-transform="updateExample"
+         title="Implicitly named graph after expansion">
+    <!--
+    [{
+      ****"http://www.w3.org/ns/prov#generatedAtTime": [{
+        "@value": "2012-04-09",
+        "@type": "http://www.w3.org/2001/XMLSchema#date"
+      }],
+      "https://w3id.org/credentials#claim": [{****
+        "@graph": [{
+          "@id": "http://manu.sporny.org/about#manu",
+          "@type": ["http://xmlns.com/foaf/0.1/Person"],
+          "http://xmlns.com/foaf/0.1/knows": [{
+            "@value": "http://greggkellogg.net/foaf#me"
+          }],
+          "http://xmlns.com/foaf/0.1/name": [{
+            "@value": "Manu Sporny"
+          }]
+        }, {
+          "@id": "http://greggkellogg.net/foaf#me",
+          "@type": ["http://xmlns.com/foaf/0.1/Person"],
+          "http://xmlns.com/foaf/0.1/knows": [{
+            "@value": "http://manu.sporny.org/about#manu"
+          }],
+          "http://xmlns.com/foaf/0.1/name": [{
+            "@value": "Gregg Kellogg"
+          }]
+        }]
+      ****}]****
+    }]
+    -->
+    </pre>
+
+    <p class="note">Strictly speaking, the value of such a <a>term</a>
+      is not a <a>named graph</a>, rather it is the <a>graph name</a>
+      associated with the <a>named graph</a>, which exists separately within
+      the <a>dataset</a>.</p>
+
+    <p class="note">Graph Containers are a new feature in JSON-LD 1.1, requiring
+      <a>processing mode</a> set to <code>json-ld-1.1</code>.</p>
+  </section>
 </section>
 
 <section class="informative">
@@ -2439,7 +2640,7 @@ <h2>Identifying Blank Nodes</h2>
     makes it impossible to reference the node from an external document. The
     <a>blank node identifier</a> is scoped  to the document in which it is used.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Specifying a local blank node identifier">
   <!--
   {
@@ -2475,7 +2676,7 @@ <h2>Aliasing Keywords</h2>
     This feature also allows developers to design domain-specific implementations
     using only the JSON-LD <a>context</a>.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Aliasing keywords">
   <!--
   {
@@ -2518,7 +2719,7 @@ <h2>Data Indexing</h2>
     <code>@index</code> <a>keyword</a> with a
     <code>@container</code> declaration in the context:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing data in JSON-LD">
   <!--
   {
@@ -2573,42 +2774,42 @@ <h2>Data Indexing</h2>
     <tbody>
       <tr>
         <td>http://example.com/</td>
-        <td>http://www.w3.org/1999/02/22-rdf-syntax-ns#type</td>
-        <td>http://schema.org/Blog</td>
+        <td>rdf:type</td>
+        <td>schema:Blog</td>
       </tr>
       <tr>
         <td>http://example.com/</td>
-        <td>http://schema.org/name</td>
+        <td>schema:name</td>
         <td>World Financial News</td>
       </tr>
       <tr>
         <td>http://example.com/</td>
-        <td>http://schema.org/blogPost</td>
+        <td>schema:blogPost</td>
         <td>http://example.com/posts/1/en</td>
       </tr>
       <tr>
         <td>http://example.com/</td>
-        <td>http://schema.org/blogPost</td>
+        <td>schema:blogPost</td>
         <td>http://example.com/posts/1/de</td>
       </tr>
       <tr>
         <td>http://example.com/posts/1/en</td>
-        <td>http://schema.org/articleBody</td>
+        <td>schema:articleBody</td>
         <td>World commodities were up today with heavy trading of crude oil...</td>
       </tr>
       <tr>
         <td>http://example.com/posts/1/en</td>
-        <td>http://schema.org/wordCount</td>
+        <td>schema:wordCount</td>
         <td>1539</td>
       </tr>
       <tr>
         <td>http://example.com/posts/1/de</td>
-        <td>http://schema.org/articleBody</td>
+        <td>schema:articleBody</td>
         <td>Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...</td>
       </tr>
       <tr>
         <td>http://example.com/posts/1/de</td>
-        <td>http://schema.org/wordCount</td>
+        <td>schema:wordCount</td>
         <td>1204</td>
       </tr>
     </tbody>
@@ -2619,11 +2820,12 @@ <h2>Data Indexing</h2>
     When <em>compacting</em>, this ensures that a JSON-LD Processor will use
     the <a>array</a> form for all values of indexes.</p>
 
-  <pre class="example changed" data-transform="updateExample"
+  <pre class="example nohighlight changed" data-transform="updateExample"
        title="Indexing data in JSON-LD with @set representation">
   <!--
   {
     "@context": {
+       ****"@version": 1.1****,
        "schema": "http://schema.org/",
        "name": "schema:name",
        "body": "schema:articleBody",
@@ -2652,13 +2854,166 @@ <h2>Data Indexing</h2>
   -->
   </pre>
 </section>
+<section class="changed">
+  <h3>Named Graph Indexing</h3>
+
+  <p>In addition to indexing <a>node objects</a> by index, <a>graph objects</a> may
+    also be indexed by an index. By using the <code>@graph</code>
+    container type, introduced in <a href="#graph-containers" class="sectionRef"></a>
+    in addition to <code>@index</code>, an object value of such a property is
+    treated as a key-value map where the keys do not map to <a>IRIs</a>, but
+    are taken from an <code>@index</code> property associated with <a>named graphs</a>
+    which are their values. When expanded, these must be <a>simple graph objects</a></p>
+
+  <p>The following example descirbes a default graph referencing multiple named
+    graphs using an <a>index map</a>.</p>
+
+  <pre class="example nohighlight" data-transform="updateExample"
+       title="Indexing graph data in JSON-LD">
+  <!--
+  {
+    "@context": {
+       ****"@version": 1.1****,
+       "schema": "http://schema.org/",
+       "name": "schema:name",
+       "body": "schema:articleBody",
+       "words": "schema:wordCount",
+       "post": {
+         "@id": "schema:blogPost",
+         "@container": ****["@graph"****, "@index"****]****
+       }
+    },
+    "@id": "http://example.com/",
+    "@type": "schema:Blog",
+    "name": "World Financial News",
+    ****"post": {
+       "en": {
+         "@id": "http://example.com/posts/1/en",
+         "body": "World commodities were up today with heavy trading of crude oil...",
+         "words": 1539
+       },
+       "de": {
+         "@id": "http://example.com/posts/1/de",
+         "body": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...",
+         "words": 1204
+       }****
+    }
+  }
+  -->
+  </pre>
+
+  <p>This expands to the following:</p>
+
+  <pre class="example nohighlight" data-transform="updateExample"
+       title="Referencing named graphs after expansion">
+  <!--
+  [{
+    "@id": "http://example.com/",
+    "@type": ["http://schema.org/Blog"],
+    "http://schema.org/blogPost": [{
+      ****"@graph"****: [{
+        "@id": "http://example.com/posts/1/de",
+        "http://schema.org/articleBody": [{
+          "@value": "Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl..."
+        }],
+        "http://schema.org/wordCount": [{"@value": 1204}]
+      }],
+      "@index": "de"
+    }, {
+      ****"@graph"****: [{
+        "@id": "http://example.com/posts/1/en",
+        "http://schema.org/articleBody": [{
+          "@value": "World commodities were up today with heavy trading of crude oil..."
+        }],
+        "http://schema.org/wordCount": [{"@value": 1539}]
+      }],
+      "@index": "en"
+    }],
+    "http://schema.org/name": [{"@value": "World Financial News"}]
+  }]
+  -->
+  </pre>
+
+  <p>When expressed as Quads, this becomes the following:</p>
+
+  <table class="example">
+  <thead><tr>
+    <th>Graph</th>
+    <th>Subject</th>
+    <th>Property</th>
+    <th>Value</th>
+    <th>Value Type</th>
+  </tr></thead>
+  <tbody>
+  <tr>
+    <td>&nbsp;</td>
+    <td>http://example.com/</td>
+    <td>rdf:type</td>
+    <td>schema:Blog</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>http://example.com/</td>
+    <td>schema:name</td>
+    <td>World Financial News</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>http://example.com/</td>
+    <td>schema:blogPost</td>
+    <td>_:b1</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>http://example.com/</td>
+    <td>schema:blogPost</td>
+    <td>_:b2</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:b1</td>
+    <td>http://example.com/posts/1/de</td>
+    <td>schema:wordCount</td>
+    <td>1204</td>
+    <td>xsd:integer</td>
+  </tr>
+  <tr>
+    <td>_:b1</td>
+    <td>http://example.com/posts/1/de</td>
+    <td>schema:articleBody</td>
+    <td>Die Werte an Warenbörsen stiegen im Sog eines starken Handels von Rohöl...</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:b2</td>
+    <td>http://example.com/posts/1/en</td>
+    <td>schema:wordCount</td>
+    <td>1539</td>
+    <td>xsd:integer</td>
+  </tr>
+  <tr>
+    <td>_:b2</td>
+    <td>http://example.com/posts/1/en</td>
+    <td>schema:articleBody</td>
+    <td>World commodities were up today with heavy trading of crude oil...</td>
+    <td></td>
+  </tr>
+  </tbody>
+  </table>
+
+  <p>As with <a>index maps</a>, when used with <code>@graph</code>, a container may also
+    include <code>@set</code> to ensure that key values are always contained in an array.</p>
+</section>
 
 <section class="informative changed">
   <h2>Language Indexing</h2>
 
   <p>JSON which includes string values in multiple languages may be
     represented using a <a>language map</a> to allow for easily
-    indexing property values by language tag. This enables direct access to
+    indexing property values by <a>language tag</a>. This enables direct access to
     lanugage values instead of having to scan an array in search of a specific item.
     In JSON-LD such data can be specified by associating the
     <code>@language</code> <a>keyword</a> with a
@@ -2696,7 +3051,7 @@ <h2>Language Indexing</h2>
     When <em>compacting</em>, this ensures that a JSON-LD Processor will use
     the <a>array</a> form for all values of language tags.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing languaged-tagged strings in JSON-LD with @set representation">
   <!--
   {
@@ -2729,11 +3084,12 @@ <h2>Node Identifier Indexing</h2>
     <code>@id</code> <a>keyword</a> with a
     <code>@container</code> declaration in the context:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing data in JSON-LD by node identifiers">
   <!--
   {
     "@context": {
+       ****"@version": 1.1****,
        "schema": "http://schema.org/",
        "name": "schema:name",
        "body": "schema:articleBody",
@@ -2774,11 +3130,12 @@ <h2>Node Identifier Indexing</h2>
     When <em>compacting</em>, this ensures that a JSON-LD Processor will use
     the <a>array</a> form for all values of node identifiers.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing data in JSON-LD by node identifiers with @set representation">
   <!--
   {
     "@context": {
+       ****"@version": 1.1****,
        "schema": "http://schema.org/",
        "name": "schema:name",
        "body": "schema:articleBody",
@@ -2809,6 +3166,180 @@ <h2>Node Identifier Indexing</h2>
     <a>processing mode</a> set to <code>json-ld-1.1</code>.</p>
 </section>
 
+<section class="changed">
+  <h3>Named Graph Indexing by Identifier</h3>
+
+  <p>In addition to indexing <a>node objects</a> by identifier, <a>graph objects</a> may
+    also be indexed by their <a>graph name</a>. By using the <code>@graph</code>
+    container type, introduced in <a href="#graph-containers" class="sectionRef"></a>
+    in addition to <code>@id</code>, an object value of such a property is
+    treated as a key-value map where the keys represent the identifiers of <a>named graphs</a>
+    which are their values.</p>
+
+  <p>The following example descirbes a default graph referencing multiple named
+    graphs using an <a>id map</a>.</p>
+
+  <pre class="example nohighlight" data-transform="updateExample"
+       title="Referencing named graphs using an id map">
+  <!--
+  {
+    "@context": {
+      ****"@version": 1.1****,
+      "generatedAt": {
+        "@id": "http://www.w3.org/ns/prov#generatedAtTime",
+        "@type": "http://www.w3.org/2001/XMLSchema#date"
+      },
+      "Person": "http://xmlns.com/foaf/0.1/Person",
+      "name": "http://xmlns.com/foaf/0.1/name",
+      "knows": "http://xmlns.com/foaf/0.1/knows",
+      ****"graphMap": {
+        "@id": "http://example.org/graphMap",
+        "@container": ["@graph", "@id"]
+      }****
+    },
+    "@id": "_:graph",
+    "generatedAt": "2012-04-09",
+    ****"graphMap": {
+      "_:manu":**** {
+        "@id": "http://manu.sporny.org/about#manu",
+        "@type": "Person",
+        "name": "Manu Sporny",
+        "knows": "http://greggkellogg.net/foaf#me"
+      },
+      ****"_:gregg"****: {
+        "@id": "http://greggkellogg.net/foaf#me",
+        "@type": "Person",
+        "name": "Gregg Kellogg",
+        "knows": "http://manu.sporny.org/about#manu"
+      }
+    }
+  }
+  -->
+  </pre>
+
+  <p>This expands to the following:</p>
+
+  <pre class="example nohighlight" data-transform="updateExample"
+       title="Referencing named graphs after expansion">
+  <!--
+  [{
+    "@id": "_:graph",
+    "http://example.org/graphMap": [{
+      "@id": "_:gregg",
+      "@graph": [{
+        "@id": "http://greggkellogg.net/foaf#me",
+        "@type": ["http://xmlns.com/foaf/0.1/Person"],
+        "http://xmlns.com/foaf/0.1/knows": [{"@value": "http://manu.sporny.org/about#manu"}],
+        "http://xmlns.com/foaf/0.1/name": [{"@value": "Gregg Kellogg"}]
+      }]
+    }, {
+      "@id": "_:manu",
+      "@graph": [{
+        "@id": "http://manu.sporny.org/about#manu",
+        "@type": [
+          "http://xmlns.com/foaf/0.1/Person"
+        ],
+        "http://xmlns.com/foaf/0.1/knows": [
+          {
+            "@value": "http://greggkellogg.net/foaf#me"
+          }
+        ],
+        "http://xmlns.com/foaf/0.1/name": [
+          {
+            "@value": "Manu Sporny"
+          }
+        ]
+      }]
+    }],
+    "http://www.w3.org/ns/prov#generatedAtTime": [{
+      "@value": "2012-04-09",
+      "@type": "http://www.w3.org/2001/XMLSchema#date"
+    }]
+  }]
+  -->
+  </pre>
+
+  <p>When expressed as Quads, this becomes the following:</p>
+
+  <table class="example">
+  <thead><tr>
+    <th>Graph</th>
+    <th>Subject</th>
+    <th>Property</th>
+    <th>Value</th>
+    <th>Value Type</th>
+  </tr></thead>
+  <tbody>
+  <tr>
+    <td>&nbsp;</td>
+    <td>_:graph</td>
+    <td>prov:generatedAtTime</td>
+    <td>2012-04-09</td>
+    <td>xsd:date</td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>_:graph</td>
+    <td>http://example.org/graphMap</td>
+    <td>http://manu.sporny.org/about#manu</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>&nbsp;</td>
+    <td>_:graph</td>
+    <td>http://example.org/graphMap</td>
+    <td>http://greggkellogg.net/foaf#me</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:manu</td>
+    <td>http://manu.sporny.org/about#manu</td>
+    <td>xsd:type</td>
+    <td>foaf:Person</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:manu</td>
+    <td>http://manu.sporny.org/about#manu</td>
+    <td>foaf:name</td>
+    <td>Manu Sporny</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:manu</td>
+    <td>http://manu.sporny.org/about#manu</td>
+    <td>foaf:knows</td>
+    <td>http://greggkellogg.net/foaf#me</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:gregg</td>
+    <td>http://greggkellogg.net/foaf#me</td>
+    <td>xsd:type</td>
+    <td>foaf:Person</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:gregg</td>
+    <td>http://greggkellogg.net/foaf#me</td>
+    <td>foaf:name</td>
+    <td>Gregg Kellogg</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>_:gregg</td>
+    <td>http://greggkellogg.net/foaf#me</td>
+    <td>foaf:knows</td>
+    <td>http://manu.sporny.org/about#manu</td>
+    <td></td>
+  </tr>
+  </tbody>
+  </table>
+
+  <p>As with <a>id maps</a>, when used with <code>@graph</code>, a container may also
+    include <code>@set</code> to ensure that key values are always contained in an array.</p>
+</section>
+
 <section class="informative changed">
   <h2>Node Type Indexing</h2>
 
@@ -2821,11 +3352,12 @@ <h2>Node Type Indexing</h2>
     <code>@type</code> <a>keyword</a> with a
     <code>@container</code> declaration in the context:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing data in JSON-LD by type">
   <!--
   {
     "@context": {
+       ****"@version": 1.1****,
        "schema": "http://schema.org/",
        "name": "schema:name",
        "affiliation": {
@@ -2858,11 +3390,12 @@ <h2>Node Type Indexing</h2>
     When <em>compacting</em>, this ensures that a JSON-LD Processor will use
     the <a>array</a> form for all values of types.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Indexing data in JSON-LD by type with @set representation">
   <!--
   {
     "@context": {
+       ****"@version": 1.1****,
        "schema": "http://schema.org/",
        "name": "schema:name",
        "affiliation": {
@@ -2896,11 +3429,12 @@ <h2>Nested Properties</h2>
     intermediate object; in JSON-LD these are called <a>nested properties</a>.
     For example, a set of possible labels may be grouped
     under a common property:</p>
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Nested properties">
   <!--
   {
     "@context": {
+      ****"@version": 1.1****,
       "skos": "http://www.w3.org/2004/02/skos/core#",
       ****"labels": "@nest"****,
       "main_label": {"@id": "skos:prefLabel"},
@@ -2925,7 +3459,7 @@ <h2>Nested Properties</h2>
     <code>@nest</code> causes it to be ignored when expanding, making it
     equivalent to the following:</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Nested properties folded into containing object">
   <!--
   {
@@ -2946,11 +3480,12 @@ <h2>Nested Properties</h2>
   <p>Similarly, node definitions may contain a <code>@nest</code> property to
     reference a term aliased to <code>@nest</code> which causes such
     values to be nested under that aliased term.</p>
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Defining property nesting">
   <!--
  {
    "@context": {
+     ****"@version": 1.1****,
      "skos": "http://www.w3.org/2004/02/skos/core#",
      ****"labels": "@nest"****,
      "main_label": {"@id": "skos:prefLabel", ****"@nest": "labels"****},
@@ -3183,7 +3718,7 @@ <h2>Embedding JSON-LD in HTML Documents</h2>
     it in a script element with the <code>type</code> attribute set to
     <code>application/ld+json</code>.</p>
 
-  <pre class="example" data-transform="updateExample"
+  <pre class="example nohighlight" data-transform="updateExample"
        title="Embedding JSON-LD in HTML">
   <!--
   ****<script type="application/ld+json">****
@@ -3289,7 +3824,7 @@ <h1>Data Model</h1>
     <li>A <a>typed value</a> consists of a value, which is a string, and a type, which is an
       <a>IRI</a>.</li>
     <li>A <a>language-tagged string</a>
-      consists of a string and a non-empty <a data-cite="BCP47#section-2">language tag</a> as defined by [[BCP47]].
+      consists of a string and a non-empty <a>language tag</a> as defined by [[BCP47]].
       The language tag MUST be well-formed according to section
       <a data-cite="BCP47#section-2.2.9">2.2.9 Classes of Conformance</a>
       of [[BCP47]].</li>
@@ -3613,6 +4148,14 @@ <h2>Index Maps</h2>
     </ul>
 
     <p>See <a class="sectionRef" href="#data-indexing"></a> for further information on this topic.</p>
+
+    <p><a>Index Maps</a> may also be used to map indexes to associated
+      <a>named graphs</a>, if the term is defined with <code>@container</code>
+      set to an array containing both <code>@graph</code> and
+      <code>@index</code>, and optionally including <code>@set</code>. The
+      value consists of the <a>node objects</a> contained within the <a>named
+      graph</a> which is named using the referencing key, which can be
+      represented as a <a>simple graph object</a>.</p>
   </section>
 
   <section class="changed">
@@ -3629,6 +4172,13 @@ <h2>Id Maps</h2>
     <p>If the value contains a property expanding to <code>@id</code>, it's value MUST
       be equivalent to the referencing key. Otherwise, the property from the value is used as
       the <code>@id</code> of the <a>node object</a> value when expanding.</p>
+
+    <p><a>Id Maps</a> may also be used to map <a>graph names</a> to their
+      <a>named graphs</a>, if the term is defined with <code>@container</code>
+      set to an array containing both <code>@graph</code> and <code>@id</code>,
+      and optionally including <code>@set</code>. The value consists of the
+      <a>node objects</a> contained within the <a>named graph</a>
+      which is named using the referencing key.</p>
   </section>
 
   <section class="changed">
@@ -3697,9 +4247,14 @@ <h2>Context Definitions</h2>
     used as key in a <a>node object</a>.</p>
 
   <p>An <a>expanded term definition</a> MUST be a <a>JSON object</a>
-    composed of zero or more keys from <code>@id</code>, <code>@reverse</code>,
-    <code>@type</code>, <code>@language</code>, <code class="changed">@context</code>,
-    <code class="changed">@prefix</code> or <code>@container</code>. An
+    composed of zero or more keys from
+    <code>@id</code>,
+    <code>@reverse</code>,
+    <code>@type</code>,
+    <code>@language</code>,
+    <code class="changed">@context</code>,
+    <code class="changed">@prefix</code>, or
+    <code>@container</code>. An
     <a>expanded term definition</a> SHOULD NOT contain any other keys.</p>
 
   <p>If an <a>expanded term definition</a> has an <code>@reverse</code> member,
@@ -3726,14 +4281,24 @@ <h2>Context Definitions</h2>
     its value MUST have the <a data-cite="BCP47#section-2.1.1">lexical form</a> described in [[!BCP47]] or be <a>null</a>.</p>
 
   <p>If the <a>expanded term definition</a> contains the <code>@container</code>
-    <a>keyword</a>, its value MUST be either <code>@list</code>, <code>@set</code>,
-    <code>@language</code>, <code>@index</code>, <span class="changed"><code>@id</code>, <code>@type</code></span> or be <a>null</a>
+    <a>keyword</a>, its value MUST be either
+    <code>@list</code>,
+    <code>@set</code>,
+    <code>@language</code>,
+    <code>@index</code>,
+    <span class="changed"><code>@id</code></span>,
+    <span class="changed"><code>@graph</code></span>,
+    <span class="changed"><code>@type</code></span>, or be
+    <a>null</a>
     <span class="changed">
-      or an <a>array</a> containing exactly any one of those keywords,
-      or a combination of <code>@set</code> and any of <code>@index</code>,
-      <code>@id</code>, <code>@type</code>, <code>@language</code>
-      in any order
+      or an <a>array</a> containing exactly any one of those keywords, or a
+      combination of <code>@set</code> and any of <code>@index</code>,
+      <code>@id</code>, <code>@graph</code>, <code>@type</code>,
+      <code>@language</code> in any order
     </span>.
+    <span class="changed"><code>@container</code> may also be an array
+      containing <code>@graph</code> along with either <code>@id</code> or
+      <code>@index</code> and also optionally including <code>@set</code>.</span>
     If the value
     is <code>@language</code>, when the <a>term</a> is used outside of the
     <code>@context</code>, the associated value MUST be a <a>language map</a>.
@@ -3917,12 +4482,14 @@ <h3>Serializing/Deserializing RDF</h3>
     <pre class="example" data-transform="updateExample"
          title="Turtle representation of expanded/flattened document">
     <!--
-    _:b0 <http://xmlns.com/foaf/0.1/name> "Dave Longley" .
+    @prefix foaf: <http://xmlns.com/foaf/0.1/> .
 
-    <http://manu.sporny.org/about#manu> <http://xmlns.com/foaf/0.1/name> "Manu Sporny" .
+    _:b0 foaf:name "Dave Longley" .
 
-    <http://me.markus-lanthaler.com/> <http://xmlns.com/foaf/0.1/name> "Markus Lanthaler" ;
-        <http://xmlns.com/foaf/0.1/knows> <http://manu.sporny.org/about#manu>, _:b0 .
+    <http://manu.sporny.org/about#manu> foaf:name "Manu Sporny" .
+
+    <http://me.markus-lanthaler.com/> foaf:name "Markus Lanthaler" ;
+        foaf:knows <http://manu.sporny.org/about#manu>, _:b0 .
     -->
     </pre>
 
@@ -3941,7 +4508,7 @@ <h2>Changes since 1.0 Recommendation of 16 January 2014</h2>
       <code>@context</code> property, which defines a <a>context</a> used for values of
       a <a>property</a> identified with such a <a>term</a>.</li>
     <li><code>@container</code> values within an <a>expanded term definition</a> may now
-      include <code>@id</code> and <code>@type</code>, corresponding to <a>id maps</a> and <a>type maps</a>.</li>
+      include <code>@id</code>, <code>@graph</code> and <code>@type</code>, corresponding to <a>id maps</a> and <a>type maps</a>.</li>
     <li>An <a>expanded term definition</a> can now have an
       <code>@nest</code> property, which identifies a term expanding to
       <code>@nest</code> which is used for containing properties using the same
@@ -3964,6 +4531,11 @@ <h2>Changes since 1.0 Recommendation of 16 January 2014</h2>
       a <code>@prefix</code> member with the value <a>true</a>. The 1.0 algorithm has
       been updated to only consider terms that map to a value that ends with a URI
       <a data-cite="RFC3986#section-2.2">gen-delim</a> character.</li>
+    <li>Values of properties where the associated <a>term definition</a>
+      has <code>@container</code> set to <code>@graph</code> are interpreted as
+      <a>implicitly named graphs</a>, where the associated graph name is either
+      assigned from a new <a>blank node identifier</a>, or defined using
+      <code>@graphId</code>.</li>
   </ul>
 </section>
 
@@ -4143,7 +4715,7 @@ <h3>RDFa</h3>
     <p>The following example describes three people with their respective names and
       homepages in RDFa [[RDFA-CORE]].</p>
 
-    <pre class="example" data-transform="updateExample"
+    <pre class="example nohighlight" data-transform="updateExample"
          title="RDFa fragment that describes three people">
     <!--
     <div ****prefix="foaf: http://xmlns.com/foaf/0.1/"****>
diff --git a/test-suite/tests/compact-0077-context.jsonld b/test-suite/tests/compact-0077-context.jsonld
new file mode 100644
index 000000000..f44755919
--- /dev/null
+++ b/test-suite/tests/compact-0077-context.jsonld
@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  }
+}
diff --git a/test-suite/tests/compact-0077-in.jsonld b/test-suite/tests/compact-0077-in.jsonld
new file mode 100644
index 000000000..8514ced21
--- /dev/null
+++ b/test-suite/tests/compact-0077-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}
diff --git a/test-suite/tests/compact-0077-out.jsonld b/test-suite/tests/compact-0077-out.jsonld
new file mode 100644
index 000000000..3f44ffbb9
--- /dev/null
+++ b/test-suite/tests/compact-0077-out.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {
+      "@id": "foo:input",
+      "@container": "@graph"
+    },
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}
diff --git a/test-suite/tests/compact-0078-context.jsonld b/test-suite/tests/compact-0078-context.jsonld
new file mode 100644
index 000000000..6b66ae3ec
--- /dev/null
+++ b/test-suite/tests/compact-0078-context.jsonld
@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": ["@graph", "@set"]},
+    "value": "foo:value"
+  }
+}
diff --git a/test-suite/tests/compact-0078-in.jsonld b/test-suite/tests/compact-0078-in.jsonld
new file mode 100644
index 000000000..8514ced21
--- /dev/null
+++ b/test-suite/tests/compact-0078-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}
diff --git a/test-suite/tests/compact-0078-out.jsonld b/test-suite/tests/compact-0078-out.jsonld
new file mode 100644
index 000000000..b283b6fee
--- /dev/null
+++ b/test-suite/tests/compact-0078-out.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {
+      "@id": "foo:input",
+      "@container": ["@graph", "@set"]
+    },
+    "value": "foo:value"
+  },
+  "input": [{
+    "value": "x"
+  }]
+}
diff --git a/test-suite/tests/compact-0079-context.jsonld b/test-suite/tests/compact-0079-context.jsonld
new file mode 100644
index 000000000..24bd02450
--- /dev/null
+++ b/test-suite/tests/compact-0079-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph"}
+  }
+}
diff --git a/test-suite/tests/compact-0079-in.jsonld b/test-suite/tests/compact-0079-in.jsonld
new file mode 100644
index 000000000..e34a943bf
--- /dev/null
+++ b/test-suite/tests/compact-0079-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }],
+    "@index": "ndx"
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0079-out.jsonld b/test-suite/tests/compact-0079-out.jsonld
new file mode 100644
index 000000000..f7c67f80f
--- /dev/null
+++ b/test-suite/tests/compact-0079-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph"}
+  },
+  "input": {
+    "value": "x"
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0080-context.jsonld b/test-suite/tests/compact-0080-context.jsonld
new file mode 100644
index 000000000..24bd02450
--- /dev/null
+++ b/test-suite/tests/compact-0080-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph"}
+  }
+}
diff --git a/test-suite/tests/compact-0080-in.jsonld b/test-suite/tests/compact-0080-in.jsonld
new file mode 100644
index 000000000..369917c85
--- /dev/null
+++ b/test-suite/tests/compact-0080-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.org/gid",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0080-out.jsonld b/test-suite/tests/compact-0080-out.jsonld
new file mode 100644
index 000000000..dd6dbea7c
--- /dev/null
+++ b/test-suite/tests/compact-0080-out.jsonld
@@ -0,0 +1,14 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph"}
+  },
+  "input": {
+    "@id": "http://example.org/gid",
+    "@graph": [
+      {
+        "value": "x"
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0081-context.jsonld b/test-suite/tests/compact-0081-context.jsonld
new file mode 100644
index 000000000..5db515f32
--- /dev/null
+++ b/test-suite/tests/compact-0081-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0081-in.jsonld b/test-suite/tests/compact-0081-in.jsonld
new file mode 100644
index 000000000..dfc5b0aa1
--- /dev/null
+++ b/test-suite/tests/compact-0081-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@index": "g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0081-out.jsonld b/test-suite/tests/compact-0081-out.jsonld
new file mode 100644
index 000000000..83d3182ba
--- /dev/null
+++ b/test-suite/tests/compact-0081-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  },
+  "input": {
+    "g1": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0082-context.jsonld b/test-suite/tests/compact-0082-context.jsonld
new file mode 100644
index 000000000..f12919ce1
--- /dev/null
+++ b/test-suite/tests/compact-0082-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index", "@set"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0082-in.jsonld b/test-suite/tests/compact-0082-in.jsonld
new file mode 100644
index 000000000..dfc5b0aa1
--- /dev/null
+++ b/test-suite/tests/compact-0082-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@index": "g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0082-out.jsonld b/test-suite/tests/compact-0082-out.jsonld
new file mode 100644
index 000000000..02b54e3d6
--- /dev/null
+++ b/test-suite/tests/compact-0082-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index", "@set"]}
+  },
+  "input": {
+    "g1": [{"value": "x"}]
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0083-context.jsonld b/test-suite/tests/compact-0083-context.jsonld
new file mode 100644
index 000000000..5db515f32
--- /dev/null
+++ b/test-suite/tests/compact-0083-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0083-in.jsonld b/test-suite/tests/compact-0083-in.jsonld
new file mode 100644
index 000000000..d362e26ab
--- /dev/null
+++ b/test-suite/tests/compact-0083-in.jsonld
@@ -0,0 +1,9 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }],
+    "@index": "g1",
+    "@id": "http://example.org/id"
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0083-out.jsonld b/test-suite/tests/compact-0083-out.jsonld
new file mode 100644
index 000000000..5c2c2f291
--- /dev/null
+++ b/test-suite/tests/compact-0083-out.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  },
+  "input": {
+    "@id": "http://example.org/id",
+    "@index": "g1",
+    "@graph": [{"value": "x"}]
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0084-context.jsonld b/test-suite/tests/compact-0084-context.jsonld
new file mode 100644
index 000000000..2de136b02
--- /dev/null
+++ b/test-suite/tests/compact-0084-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0084-in.jsonld b/test-suite/tests/compact-0084-in.jsonld
new file mode 100644
index 000000000..e01c12ee5
--- /dev/null
+++ b/test-suite/tests/compact-0084-in.jsonld
@@ -0,0 +1,7 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0084-out.jsonld b/test-suite/tests/compact-0084-out.jsonld
new file mode 100644
index 000000000..31003800b
--- /dev/null
+++ b/test-suite/tests/compact-0084-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  },
+  "input": {
+    "_:b0": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0085-context.jsonld b/test-suite/tests/compact-0085-context.jsonld
new file mode 100644
index 000000000..2de136b02
--- /dev/null
+++ b/test-suite/tests/compact-0085-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0085-in.jsonld b/test-suite/tests/compact-0085-in.jsonld
new file mode 100644
index 000000000..67441b87b
--- /dev/null
+++ b/test-suite/tests/compact-0085-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }],
+    "@id": "http://example.org/id"
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0085-out.jsonld b/test-suite/tests/compact-0085-out.jsonld
new file mode 100644
index 000000000..274777bf4
--- /dev/null
+++ b/test-suite/tests/compact-0085-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  },
+  "input": {
+    "http://example.org/id" : {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0086-context.jsonld b/test-suite/tests/compact-0086-context.jsonld
new file mode 100644
index 000000000..5b7f15037
--- /dev/null
+++ b/test-suite/tests/compact-0086-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id", "@set"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0086-in.jsonld b/test-suite/tests/compact-0086-in.jsonld
new file mode 100644
index 000000000..e01c12ee5
--- /dev/null
+++ b/test-suite/tests/compact-0086-in.jsonld
@@ -0,0 +1,7 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0086-out.jsonld b/test-suite/tests/compact-0086-out.jsonld
new file mode 100644
index 000000000..bbc1a4378
--- /dev/null
+++ b/test-suite/tests/compact-0086-out.jsonld
@@ -0,0 +1,7 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id", "@set"]}
+  },
+  "input": {"_:b0": [{"value": "x"}]}
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0087-context.jsonld b/test-suite/tests/compact-0087-context.jsonld
new file mode 100644
index 000000000..5b7f15037
--- /dev/null
+++ b/test-suite/tests/compact-0087-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id", "@set"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0087-in.jsonld b/test-suite/tests/compact-0087-in.jsonld
new file mode 100644
index 000000000..67441b87b
--- /dev/null
+++ b/test-suite/tests/compact-0087-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }],
+    "@id": "http://example.org/id"
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0087-out.jsonld b/test-suite/tests/compact-0087-out.jsonld
new file mode 100644
index 000000000..d8420e595
--- /dev/null
+++ b/test-suite/tests/compact-0087-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id", "@set"]}
+  },
+  "input": {
+    "http://example.org/id" : [{"value": "x"}]
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0088-context.jsonld b/test-suite/tests/compact-0088-context.jsonld
new file mode 100644
index 000000000..2de136b02
--- /dev/null
+++ b/test-suite/tests/compact-0088-context.jsonld
@@ -0,0 +1,6 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-0088-in.jsonld b/test-suite/tests/compact-0088-in.jsonld
new file mode 100644
index 000000000..e34a943bf
--- /dev/null
+++ b/test-suite/tests/compact-0088-in.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }],
+    "@index": "ndx"
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/compact-0088-out.jsonld b/test-suite/tests/compact-0088-out.jsonld
new file mode 100644
index 000000000..31003800b
--- /dev/null
+++ b/test-suite/tests/compact-0088-out.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  },
+  "input": {
+    "_:b0": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/compact-manifest.jsonld b/test-suite/tests/compact-manifest.jsonld
index e6e9689d7..99f411719 100644
--- a/test-suite/tests/compact-manifest.jsonld
+++ b/test-suite/tests/compact-manifest.jsonld
@@ -628,6 +628,114 @@
       "input": "compact-0076-in.jsonld",
       "context": "compact-0076-context.jsonld",
       "expect": "compact-0076-out.jsonld"
+    }, {
+      "@id": "#t0077",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a @graph container",
+      "purpose": "Compact a @graph container",
+      "input": "compact-0077-in.jsonld",
+      "context": "compact-0077-context.jsonld",
+      "expect": "compact-0077-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0078",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a [@graph, @set] container",
+      "purpose": "Compact with [@graph, @set]",
+      "input": "compact-0078-in.jsonld",
+      "context": "compact-0078-context.jsonld",
+      "expect": "compact-0078-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0079",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a @graph container having @index",
+      "purpose": "Verify that having both @graph and @index allows @graph container compaction",
+      "input": "compact-0079-in.jsonld",
+      "context": "compact-0079-context.jsonld",
+      "expect": "compact-0079-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0080",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Do not compact a graph having @id with a term having an @graph container",
+      "purpose": "Graph compaction works only on simple graphs",
+      "input": "compact-0080-in.jsonld",
+      "context": "compact-0080-context.jsonld",
+      "expect": "compact-0080-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0081",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a [@graph, @index] container",
+      "purpose": "Compact a @graph container with @index",
+      "input": "compact-0081-in.jsonld",
+      "context": "compact-0081-context.jsonld",
+      "expect": "compact-0081-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0082",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a [@graph, @index, @set] container",
+      "purpose": "Compact a @graph container with @index and @set",
+      "input": "compact-0082-in.jsonld",
+      "context": "compact-0082-context.jsonld",
+      "expect": "compact-0082-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0083",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "[@graph, @index] does not compact graph with @id",
+      "purpose": "Graph compaction with @graph and @index works only on simple graphs",
+      "input": "compact-0083-in.jsonld",
+      "context": "compact-0083-context.jsonld",
+      "expect": "compact-0083-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0084",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a simple graph with a [@graph, @id] container",
+      "purpose": "Compact a simple graph using a @graph container with @id",
+      "input": "compact-0084-in.jsonld",
+      "context": "compact-0084-context.jsonld",
+      "expect": "compact-0084-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0085",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a named graph with a [@graph, @id] container",
+      "purpose": "Compact a named graph using a @graph container with @id",
+      "input": "compact-0085-in.jsonld",
+      "context": "compact-0085-context.jsonld",
+      "expect": "compact-0085-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0086",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a simple graph with a [@graph, @id, @set] container",
+      "purpose": "Compact a simple graph using a @graph container with @id and @set",
+      "input": "compact-0086-in.jsonld",
+      "context": "compact-0086-context.jsonld",
+      "expect": "compact-0086-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0087",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a named graph with a [@graph, @id, @set] container",
+      "purpose": "Compact a named graph using a @graph container with @id and @set",
+      "input": "compact-0087-in.jsonld",
+      "context": "compact-0087-context.jsonld",
+      "expect": "compact-0087-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0088",
+      "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
+      "name": "Compact a graph with @index using a [@graph, @id] container",
+      "purpose": "Compact a @graph container with @id and @set, discarding an @index value",
+      "input": "compact-0088-in.jsonld",
+      "context": "compact-0088-context.jsonld",
+      "expect": "compact-0088-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:CompactTest"],
diff --git a/test-suite/tests/expand-0079-in.jsonld b/test-suite/tests/expand-0079-in.jsonld
new file mode 100644
index 000000000..8514ced21
--- /dev/null
+++ b/test-suite/tests/expand-0079-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": "@graph"},
+    "value": "foo:value"
+  },
+  "input": {
+    "value": "x"
+  }
+}
diff --git a/test-suite/tests/expand-0079-out.jsonld b/test-suite/tests/expand-0079-out.jsonld
new file mode 100644
index 000000000..371662470
--- /dev/null
+++ b/test-suite/tests/expand-0079-out.jsonld
@@ -0,0 +1,9 @@
+[{
+  "foo:input": [{
+    "@graph": [{
+      "foo:value": [{
+        "@value": "x"
+      }]
+    }]
+  }]
+}]
diff --git a/test-suite/tests/expand-0080-in.jsonld b/test-suite/tests/expand-0080-in.jsonld
new file mode 100644
index 000000000..098f86841
--- /dev/null
+++ b/test-suite/tests/expand-0080-in.jsonld
@@ -0,0 +1,10 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "input": {"@id": "foo:input", "@container": ["@graph", "@set"]},
+    "value": "foo:value"
+  },
+  "input": [{
+    "value": "x"
+  }]
+}
diff --git a/test-suite/tests/expand-0080-out.jsonld b/test-suite/tests/expand-0080-out.jsonld
new file mode 100644
index 000000000..371662470
--- /dev/null
+++ b/test-suite/tests/expand-0080-out.jsonld
@@ -0,0 +1,9 @@
+[{
+  "foo:input": [{
+    "@graph": [{
+      "foo:value": [{
+        "@value": "x"
+      }]
+    }]
+  }]
+}]
diff --git a/test-suite/tests/expand-0081-in.jsonld b/test-suite/tests/expand-0081-in.jsonld
new file mode 100644
index 000000000..d17429791
--- /dev/null
+++ b/test-suite/tests/expand-0081-in.jsonld
@@ -0,0 +1,11 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": "@graph"}
+  },
+  "input": {
+    "@graph": {
+      "value": "x"
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0081-out.jsonld b/test-suite/tests/expand-0081-out.jsonld
new file mode 100644
index 000000000..e01c12ee5
--- /dev/null
+++ b/test-suite/tests/expand-0081-out.jsonld
@@ -0,0 +1,7 @@
+[{
+  "http://example.org/input": [{
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0082-in.jsonld b/test-suite/tests/expand-0082-in.jsonld
new file mode 100644
index 000000000..83d3182ba
--- /dev/null
+++ b/test-suite/tests/expand-0082-in.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  },
+  "input": {
+    "g1": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0082-out.jsonld b/test-suite/tests/expand-0082-out.jsonld
new file mode 100644
index 000000000..dfc5b0aa1
--- /dev/null
+++ b/test-suite/tests/expand-0082-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@index": "g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0083-in.jsonld b/test-suite/tests/expand-0083-in.jsonld
new file mode 100644
index 000000000..71f8a50fe
--- /dev/null
+++ b/test-suite/tests/expand-0083-in.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index", "@set"]}
+  },
+  "input": {
+    "g1": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0083-out.jsonld b/test-suite/tests/expand-0083-out.jsonld
new file mode 100644
index 000000000..dfc5b0aa1
--- /dev/null
+++ b/test-suite/tests/expand-0083-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@index": "g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0084-in.jsonld b/test-suite/tests/expand-0084-in.jsonld
new file mode 100644
index 000000000..0026a778b
--- /dev/null
+++ b/test-suite/tests/expand-0084-in.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@index"]}
+  },
+  "input": {
+    "g1": {
+      "@graph": {
+        "value": "x"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0084-out.jsonld b/test-suite/tests/expand-0084-out.jsonld
new file mode 100644
index 000000000..dfc5b0aa1
--- /dev/null
+++ b/test-suite/tests/expand-0084-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@index": "g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0085-in.jsonld b/test-suite/tests/expand-0085-in.jsonld
new file mode 100644
index 000000000..3cd17bc25
--- /dev/null
+++ b/test-suite/tests/expand-0085-in.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  },
+  "input": {
+    "http://example.com/g1": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0085-out.jsonld b/test-suite/tests/expand-0085-out.jsonld
new file mode 100644
index 000000000..7cb99fca1
--- /dev/null
+++ b/test-suite/tests/expand-0085-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.com/g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0086-in.jsonld b/test-suite/tests/expand-0086-in.jsonld
new file mode 100644
index 000000000..27ea6de71
--- /dev/null
+++ b/test-suite/tests/expand-0086-in.jsonld
@@ -0,0 +1,9 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id", "@set"]}
+  },
+  "input": {
+    "http://example.com/g1": {"value": "x"}
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0086-out.jsonld b/test-suite/tests/expand-0086-out.jsonld
new file mode 100644
index 000000000..7cb99fca1
--- /dev/null
+++ b/test-suite/tests/expand-0086-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.com/g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-0087-in.jsonld b/test-suite/tests/expand-0087-in.jsonld
new file mode 100644
index 000000000..aa994f300
--- /dev/null
+++ b/test-suite/tests/expand-0087-in.jsonld
@@ -0,0 +1,13 @@
+{
+  "@context": {
+    "@vocab": "http://example.org/",
+    "input": {"@container": ["@graph", "@id"]}
+  },
+  "input": {
+    "http://example.com/g1": {
+      "@graph": {
+        "value": "x"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/test-suite/tests/expand-0087-out.jsonld b/test-suite/tests/expand-0087-out.jsonld
new file mode 100644
index 000000000..7cb99fca1
--- /dev/null
+++ b/test-suite/tests/expand-0087-out.jsonld
@@ -0,0 +1,8 @@
+[{
+  "http://example.org/input": [{
+    "@id": "http://example.com/g1",
+    "@graph": [{
+      "http://example.org/value": [{"@value": "x"}]
+    }]
+  }]
+}]
\ No newline at end of file
diff --git a/test-suite/tests/expand-manifest.jsonld b/test-suite/tests/expand-manifest.jsonld
index 153cbe9e8..771e6872a 100644
--- a/test-suite/tests/expand-manifest.jsonld
+++ b/test-suite/tests/expand-manifest.jsonld
@@ -558,6 +558,78 @@
       "purpose": "Use of multiple reverse properties",
       "input": "expand-0078-in.jsonld",
       "expect": "expand-0078-out.jsonld"
+    }, {
+      "@id": "#t0079",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand @graph container",
+      "purpose": "Use of @graph containers",
+      "input": "expand-0079-in.jsonld",
+      "expect": "expand-0079-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0080",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand [@graph, @set] container",
+      "purpose": "Use of [@graph, @set] containers",
+      "input": "expand-0080-in.jsonld",
+      "expect": "expand-0080-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0081",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Does not create an @graph container if value is a graph",
+      "purpose": "Don't double-expand an already expanded graph",
+      "input": "expand-0081-in.jsonld",
+      "expect": "expand-0081-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0082",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand [@graph, @index] container",
+      "purpose": "Use of @graph containers with @index",
+      "input": "expand-0082-in.jsonld",
+      "expect": "expand-0082-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0083",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand [@graph, @index, @set] container",
+      "purpose": "Use of @graph containers with @index and @set",
+      "input": "expand-0083-in.jsonld",
+      "expect": "expand-0083-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0084",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Do not expand [@graph, @index, @set] container if value is a graph",
+      "purpose": "Does not create a new graph object if indexed value is already a graph object",
+      "input": "expand-0084-in.jsonld",
+      "expect": "expand-0084-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0085",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand [@graph, @id] container",
+      "purpose": "Use of @graph containers with @id",
+      "input": "expand-0085-in.jsonld",
+      "expect": "expand-0085-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0086",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "expand [@graph, @id, @set] container",
+      "purpose": "Use of @graph containers with @id and @set",
+      "input": "expand-0086-in.jsonld",
+      "expect": "expand-0086-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
+    }, {
+      "@id": "#t0087",
+      "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],
+      "name": "Do not expand [@graph, @id, @set] container if value is a graph",
+      "purpose": "Does not create a new graph object if indexed value is already a graph object",
+      "input": "expand-0087-in.jsonld",
+      "expect": "expand-0087-out.jsonld",
+      "option": {"processingMode": "json-ld-1.1", "specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],