diff --git a/Gemfile.lock b/Gemfile.lock
index 7e296e7..d41cbde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,16 +1,18 @@
 GIT
   remote: git://github.com/ruby-rdf/json-ld.git
-  revision: 7717390f78fea8152f9d82a1d52f3695dd36575e
+  revision: d1acea9a066ef1dcc28a24212dea29559b07a60d
   branch: develop
   specs:
     json-ld (3.0.2)
+      link_header (~> 0.0, >= 0.0.8)
       multi_json (~> 1.13)
       rack (>= 1.6, < 3.0)
+      rdf (~> 3.0, >= 3.0.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     bcp47 (0.3.3)
       i18n
@@ -29,7 +31,7 @@ GEM
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
     htmlentities (4.3.4)
-    i18n (1.4.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     json-ld-preloaded (3.0.2)
       json-ld (~> 3.0)
@@ -71,14 +73,14 @@ GEM
     multi_json (1.13.1)
     net-http-persistent (3.0.0)
       connection_pool (~> 2.2)
-    nokogiri (1.9.1)
+    nokogiri (1.10.1)
       mini_portile2 (~> 2.4.0)
     nokogumbo (1.5.0)
       nokogiri
     public_suffix (3.0.3)
     rack (2.0.6)
     rake (12.3.2)
-    rdf (3.0.9)
+    rdf (3.0.10)
       hamster (~> 3.0)
       link_header (~> 0.0, >= 0.0.8)
     rdf-aggregate-repo (2.2.1)
@@ -124,7 +126,7 @@ GEM
       rdf-turtle (~> 3.0, >= 3.0.3)
     rdf-trix (2.2.1)
       rdf (>= 2.2, < 4.0)
-    rdf-turtle (3.0.3)
+    rdf-turtle (3.0.5)
       ebnf (~> 1.1)
       rdf (~> 3.0)
     rdf-vocab (3.0.4)
diff --git a/Rakefile b/Rakefile
index e14cf9c..94d4d38 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,3 +1,4 @@
+require 'bundler/setup'
 task default: :test
 
 desc "Test examples in spec files"
diff --git a/common/terms.html b/common/terms.html
index 62f5aa1..fc58f1c 100644
--- a/common/terms.html
+++ b/common/terms.html
@@ -112,6 +112,16 @@
     Whenever possible, an <a>edge</a> should be labeled with an <a>IRI</a>.
     <div class="issue atrisk">The use of <a>blank node identifiers</a> to label properties is obsolete,
       and may be removed in a future version of JSON-LD.</div></dd>
+  <dt><dfn>embedded context</dfn></dt><dd>
+    An embedded <a>context</a> is a <a>dictionary</a> composed of a combintation of
+    <a>term definitions</a>, a <a>vocabulary mapping</a>, a <a>base IRI</a> and <a>default language</a>.
+    An <a>embedded context</a> may appear as part of a <a>node object</a> or <a>value object</a> using the
+    <code>@context</code> <a>member</a>.
+  </dd>
+  <dt><dfn>scoped context</dfn></dt><dd>
+    A <a>scoped context</a> is part of an <a>expanded term definition</a> using the
+    <code>@context</code> <a>member</a>. It has the same form as an <a>embedded context</a>.
+  </dd>
   <dt><dfn>expanded term definition</dfn></dt><dd>
     An expanded term definition is a <a>term definition</a>
     where the value is a <a>dictionary</a>
@@ -150,7 +160,8 @@
     is a <a>graph object</a> which does not have an <code>@id</code> <a>member</a>.
     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 <a>members</a>.
-    A top-level object consisting of <code>@graph</code> is also not a <a>graph object</a>.</dd>
+    A top-level object consisting of <code>@graph</code> is also not a <a>graph object</a>.
+    Note that a <a>node object</a> may also represent a <a>named graph</a> it it includes other properties.</dd>
   <dt><dfn>index map</dfn></dt><dd>
     An <a>index map</a> is a <a>dictionary</a> value of a <a>term</a>
     defined with <code>@container</code> set to <code>@index</code>,
@@ -212,7 +223,8 @@
     A <a>list</a> is an ordered sequence of <a>IRIs</a>, <a>blank nodes</a>, and <a>JSON-LD values</a>.
     See <dfn data-cite="RDF-SCHEMA#ch_collectionvocab" data-lt="collection" class="preserve">RDF collection</dfn> in [[RDF-SCHEMA]].</dd>
   <dt><dfn>list object</dfn></dt><dd>
-    A <a>list object</a> is a <a>dictionary</a> that has a <code>@list</code> key.</dd>
+    A <a>list object</a> is a <a>dictionary</a> that has a <code>@list</code> key.
+    It may also have an <code>@index</code> key, but no other members.</dd>
   <dt><dfn>literal</dfn></dt><dd>
     An <a>object</a> expressed as a value such as a string, number or in expanded form.</dd>
   <dt><dfn>local context</dfn></dt><dd>
@@ -294,7 +306,8 @@
     are resolved relative to the <a>vocabulary mapping</a>,
     not the <a>base IRI</a>.</dd>
   <dt><dfn>set object</dfn></dt><dd>
-    A <a>set object</a> is a <a>dictionary</a> that has an <code>@set</code> <a>member</a>.</dd>
+    A <a>set object</a> is a <a>dictionary</a> that has an <code>@set</code> <a>member</a>.
+    It may also have an <code>@index</code> key, but no other members.</dd>
   <dt><dfn>subject</dfn></dt><dd>
     A <a data-cite="RDF11-CONCEPTS#dfn-subject" class="externalDFN">subject</a>
     is a <a>node</a> in a <a>linked data graph</a>
@@ -335,5 +348,5 @@
     A <a>value object</a> is a <a>dictionary</a> that has an <code>@value</code> <a>member</a>.</dd>
   <dt><dfn>vocabulary mapping</dfn></dt><dd>
     The vocabulary mapping is set in the <a>context</a> using the <code>@vocab</code> key
-    whose value MUST be an <a>absolute IRI</a> or <code>null</code>.</dd>
+    whose value MUST be an <a>IRI</a> or <code>null</code>.</dd>
 </dl>
diff --git a/index.html b/index.html
index 9ce7f8f..b15ce8f 100644
--- a/index.html
+++ b/index.html
@@ -1684,6 +1684,8 @@ <h3>application/ld+json</h3>
   <dt>Subtype name:</dt>
   <dd class="changed">ld+json</dd>
   <dt class="changed">Required parameters:</dt>
+    <dd>None</dd>
+  <dt class="changed">Optional parameters:</dt>
   <dd class="changed">
     <dl>
       <dt><code>profile</code></dt>
@@ -1697,11 +1699,11 @@ <h3>application/ld+json</h3>
           <dt><code>http://www.w3.org/ns/json-ld#framed</code></dt>
           <dd>To specify a JSON-LD <a>Frame</a>.</dd>
         </dl>
+        <p>The <code>http://www.w3.org/ns/json-ld#framed</code> SHOULD
+          be used when serving and requesting a JSON-LD frame document.</p>
       </dd>
     </dl>
   </dd>
-  <dt>Optional parameters:</dt>
-  <dd>None.</dd>
   <dt>Encoding considerations:</dt>
   <dd>See <a data-cite="RFC8259#section-11">RFC&nbsp;8259, section 11</a>.</dd>
   <dt>Security considerations:</dt>