diff --git a/reference/html/README.html b/reference/html/README.html
index 4a5b55468..819cd1877 100644
--- a/reference/html/README.html
+++ b/reference/html/README.html
@@ -705,8 +705,8 @@ In extreme cases, too much baggage can crash the application, due to exceeding t
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Span initialSpan = this.tracer.nextSpan().name("span").start();
-ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar");
-ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue");</code></pre>
+foo.updateValue(initialSpan.context(), "1");
+bar.updateValue(initialSpan.context(), "2");</code></pre>
 </div>
 </div>
 <div class="sect4">
@@ -753,22 +753,14 @@ The span must be in scope.
 <div class="listingblock">
 <div class="title">The setup</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">spring.sleuth:
-  baggage-keys:
-    - baz
-    - bizarrecase
-  propagation-keys:
-    - foo
-    - upper_case</code></pre>
+<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="title">The code</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">initialSpan.tag("foo",
-		ExtraFieldPropagation.get(initialSpan.context(), "foo"));
-initialSpan.tag("UPPER_CASE",
-		ExtraFieldPropagation.get(initialSpan.context(), "UPPER_CASE"));</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Tags.BAGGAGE_FIELD.tag(foo, initialSpan);
+Tags.BAGGAGE_FIELD.tag(bar, initialSpan);</code></pre>
 </div>
 </div>
 </div>
diff --git a/reference/html/index.html b/reference/html/index.html
index 570339542..0c349423b 100644
--- a/reference/html/index.html
+++ b/reference/html/index.html
@@ -679,8 +679,8 @@ In extreme cases, too much baggage can crash the application, due to exceeding t
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Span initialSpan = this.tracer.nextSpan().name("span").start();
-ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar");
-ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue");</code></pre>
+foo.updateValue(initialSpan.context(), "1");
+bar.updateValue(initialSpan.context(), "2");</code></pre>
 </div>
 </div>
 <div class="sect4">
@@ -727,22 +727,14 @@ The span must be in scope.
 <div class="listingblock">
 <div class="title">The setup</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">spring.sleuth:
-  baggage-keys:
-    - baz
-    - bizarrecase
-  propagation-keys:
-    - foo
-    - upper_case</code></pre>
+<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="title">The code</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">initialSpan.tag("foo",
-        ExtraFieldPropagation.get(initialSpan.context(), "foo"));
-initialSpan.tag("UPPER_CASE",
-        ExtraFieldPropagation.get(initialSpan.context(), "UPPER_CASE"));</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Tags.BAGGAGE_FIELD.tag(foo, initialSpan);
+Tags.BAGGAGE_FIELD.tag(bar, initialSpan);</code></pre>
 </div>
 </div>
 </div>
diff --git a/reference/html/intro.html b/reference/html/intro.html
index 78b4dc0b3..c2eff3ad4 100644
--- a/reference/html/intro.html
+++ b/reference/html/intro.html
@@ -605,8 +605,8 @@ In extreme cases, too much baggage can crash the application, due to exceeding t
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Span initialSpan = this.tracer.nextSpan().name("span").start();
-ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar");
-ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue");</code></pre>
+foo.updateValue(initialSpan.context(), "1");
+bar.updateValue(initialSpan.context(), "2");</code></pre>
 </div>
 </div>
 <div class="sect4">
@@ -653,22 +653,14 @@ The span must be in scope.
 <div class="listingblock">
 <div class="title">The setup</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">spring.sleuth:
-  baggage-keys:
-    - baz
-    - bizarrecase
-  propagation-keys:
-    - foo
-    - upper_case</code></pre>
+<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="title">The code</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">initialSpan.tag("foo",
-		ExtraFieldPropagation.get(initialSpan.context(), "foo"));
-initialSpan.tag("UPPER_CASE",
-		ExtraFieldPropagation.get(initialSpan.context(), "UPPER_CASE"));</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Tags.BAGGAGE_FIELD.tag(foo, initialSpan);
+Tags.BAGGAGE_FIELD.tag(bar, initialSpan);</code></pre>
 </div>
 </div>
 </div>
diff --git a/reference/html/spring-cloud-sleuth.html b/reference/html/spring-cloud-sleuth.html
index 570339542..0c349423b 100644
--- a/reference/html/spring-cloud-sleuth.html
+++ b/reference/html/spring-cloud-sleuth.html
@@ -679,8 +679,8 @@ In extreme cases, too much baggage can crash the application, due to exceeding t
 <div class="listingblock">
 <div class="content">
 <pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Span initialSpan = this.tracer.nextSpan().name("span").start();
-ExtraFieldPropagation.set(initialSpan.context(), "foo", "bar");
-ExtraFieldPropagation.set(initialSpan.context(), "UPPER_CASE", "someValue");</code></pre>
+foo.updateValue(initialSpan.context(), "1");
+bar.updateValue(initialSpan.context(), "2");</code></pre>
 </div>
 </div>
 <div class="sect4">
@@ -727,22 +727,14 @@ The span must be in scope.
 <div class="listingblock">
 <div class="title">The setup</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">spring.sleuth:
-  baggage-keys:
-    - baz
-    - bizarrecase
-  propagation-keys:
-    - foo
-    - upper_case</code></pre>
+<pre class="highlightjs highlight"><code class="language-yml hljs" data-lang="yml">Unresolved directive in intro.adoc - include::/opt/jenkins/data/workspace/spring-cloud-sleuth-master-ci/spring-cloud-sleuth-core/src/test/resources/application-baggage.yml[indent=0]</code></pre>
 </div>
 </div>
 <div class="listingblock">
 <div class="title">The code</div>
 <div class="content">
-<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">initialSpan.tag("foo",
-        ExtraFieldPropagation.get(initialSpan.context(), "foo"));
-initialSpan.tag("UPPER_CASE",
-        ExtraFieldPropagation.get(initialSpan.context(), "UPPER_CASE"));</code></pre>
+<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">Tags.BAGGAGE_FIELD.tag(foo, initialSpan);
+Tags.BAGGAGE_FIELD.tag(bar, initialSpan);</code></pre>
 </div>
 </div>
 </div>